Merging bottom PR with squash causes conflicts on the stacked PR #273
gabrielb-broadsign
started this conversation in
Feedback
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
-
Using stacked PRs with the squash merge strategy, after merging the bottom PR of a stack, the top PR ends up showing merge conflicts. I suppose this could happen on any partial stack merge.
Context / workflow:
feature-1branched offmain, opened as PR#1.feature-2branched offfeature-1, opened as PR#2 (stacked on PR#1).mainvia squash merge.Assuming this works as intended when merging the whole stack, the same strategy should probably be applied to update the PRs left unmerged when merging the stack partially.
Can you confirm this is expected, and if so, is there a plan to auto-update/rebase remaining stacked PRs on partial merges the same way it presumably happens on full stack merges?
Beta Was this translation helpful? Give feedback.
All reactions