I can’t seem to merge a stack of two PRs — the fir...
# how-do-i
m
I can’t seem to merge a stack of two PRs — the first PR merges, but the 2nd one fails to merge. I suspect that it’s related to the GH repo setting of
Dismiss stale pull request approvals when new commits are pushed
that we have enabled, causing the 2nd PR to “lose” its approval. Does this makes sense? is there a way around it without disabling this option?
✅ 1
p
Yeah this GitHub option has definitely made stack merge a bit more challenging on our part (cc @Jacob Gold for stack merge issues)
j
What merge strategy do you use? If you squash and merge or rebase and merge, and have the same files changed in two stacked branches, Graphite needs to rebase the second PR before merging it in order to get around "extraneous" merge conflicts, which means we necessarily push extra changes to the branch. You can get around this rule if you use standard merge commits, I believe, but our general recommendation has been for folks to turn this branch protection off.
m
Gotcha. We’re using squash & merge. Thanks for the answer!