You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
When you add a new branch to a stack, it creates the new branch from the bottom of the stack e.g. the last branch. This is normally fine, however if the last branch has already been merged it is likely not to be up to date with the head of the stack (probably main) because merged branches get skipped in stack update. This means it'll start behind already, and could have conflicts. It would probably be better in this scenario to create the new branch from the source branch. The general approach I think it "create the new branch from the lowest branch in the stack that isn't merged". Should probably also run a stack update before creating the new branch to make sure everything is up to date, to create a good experience.
The text was updated successfully, but these errors were encountered:
When you add a new branch to a stack, it creates the new branch from the bottom of the stack e.g. the last branch. This is normally fine, however if the last branch has already been merged it is likely not to be up to date with the head of the stack (probably
main
) because merged branches get skipped instack update
. This means it'll start behind already, and could have conflicts. It would probably be better in this scenario to create the new branch from the source branch. The general approach I think it "create the new branch from the lowest branch in the stack that isn't merged". Should probably also run astack update
before creating the new branch to make sure everything is up to date, to create a good experience.The text was updated successfully, but these errors were encountered: