Approach I’m going for takes advantage of rebases rather than merges. Rebasing a chain of commits in a branch can lead to multiple conflicts unlike a merge. Also simplifies implementation and commit ownership since git branches are just tips
Also Google and Airbnb both just squash merge anyway 🤷♂️
Thanks for the interest! I've missed a tool like this since moving away from Mercurial. It's super duper early. Please send issues and questions my way, especially if they're big blockers for you
main, A, B, C (one commit per branch)
amend A
merge A into B, soft reset B to A, re-commit
merge B into C, soft reset C to B, re-commit
merge A into main with ff-only (using CLI, because github UI doesn't support it https://github.com/orgs/community/discussions/4618)
So that means currently you have to do a dance of merge pr, sync so that it cleans up some branches, then go ui delete branch button on merged PR page then repeat merge child.
But currently I don’t realistically merge entire PR chains at once so it’s like… fine.
Comments
Also Google and Airbnb both just squash merge anyway 🤷♂️
main, A, B, C (one commit per branch)
amend A
merge A into B, soft reset B to A, re-commit
merge B into C, soft reset C to B, re-commit
merge A into main with ff-only (using CLI, because github UI doesn't support it https://github.com/orgs/community/discussions/4618)
Then merge with GH UI, bb sync
Current problem I need to solve is the only way to get the gh UI to automatically update the merge branch on a PR is to delete the remote branch
But currently I don’t realistically merge entire PR chains at once so it’s like… fine.