Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve adding a new branch to a stack when existing branches are already merged #103

Open
geofflamrock opened this issue Dec 4, 2024 · 0 comments
Labels
enhancement New feature or request

Comments

@geofflamrock
Copy link
Owner

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.

@geofflamrock geofflamrock added the enhancement New feature or request label Dec 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

1 participant