PRs get blocked due to "merge base changed", yet no approval unblocks the PR #181705
Replies: 1 comment
-
|
💬 Your Product Feedback Has Been Submitted 🎉 Thank you for taking the time to share your insights with us! Your feedback is invaluable as we build a better GitHub experience for all our users. Here's what you can expect moving forward ⏩
Where to look to see what's shipping 👀
What you can do in the meantime 💻
As a member of the GitHub community, your participation is essential. While we can't promise that every suggestion will be implemented, we want to emphasize that your feedback is instrumental in guiding our decisions and priorities. Thank you once again for your contribution to making GitHub even better! We're grateful for your ongoing support and collaboration in shaping the future of our platform. ⭐ |
Beta Was this translation helpful? Give feedback.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
-
Select Topic Area
Bug
Body
When a repo has branch rules that require an approver on the last iteration of a pull request, an approved PR may still be blocked with this message:
At this point, there is nothing more that can be done by any reviewer. All approvals are considered stale.
How do we get to this point? Follow these steps:
Aoff of the default branch in your git repo. Commit once.Bbased onA. Commit once.Aand one mergingB.Aand complete it with a merge (not a squash or rebase).B. It's now stuck.The only workarounds for this are for the PR author to EITHER:
Bonto the default branch and force push to their PR. This rewrites git history.Both workarounds reset all PR checks and requires yet a fresh (re-)approval of the PR before it can merge, even though all the changes have already been reviewed.
Please fix this!
Beta Was this translation helpful? Give feedback.
All reactions