Critical Bug: PR Conflict Resolution Reverses Merge Direction #177004
Replies: 2 comments
-
|
💬 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.
-
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
Severity: High - Can cause wrong-direction merges affecting production systems
Description:
The GitHub web interface conflict resolution feature incorrectly reverses the merge direction during conflict resolution, causing develop branch changes to be merged into master when the original PR was intended to merge master into develop.
Steps to Reproduce:
master→developExpected Behavior:
Conflict resolution should maintain the original PR direction (master → develop)
Actual Behavior:
Conflict resolution reverses the direction and merges develop → master
Evidence:
changes → master" instead of "→ develop"
Impact:
Environment:
Workaround:
Use command-line git conflict resolution instead of GitHub's web interface.
Beta Was this translation helpful? Give feedback.
All reactions