PRs merging with the wrong merge method

[pajlada]

Select Topic Area

Bug

Body

In a project that allows both the Merge method and the Squash & Merge method, if I try to use the Squash & Merge method, it uses the Merge method anyway.

It looks like this might be related to the feature flag merge_box_use_fetch_with_error_handling which looks like it causes the data: MutationData to not be sent along in the request

Workarounds you can try

• Disable the unwanted commit types in your repo
• Use the GitHub CLI to merge the PRs

[andypearson]

Yup, I'm seeing this as well. I am getting "The selected merge method (squash) is not allowed." even though I only have "Rebase and merge" enabled.

To merge two PRs I had to enable the merge commit option, which is not ideal :(

[shinny-zhangyihang]

I am experiencing the same problem

[zvuc]

Same here

[josiahwitheford]

We are also seeing this one, and it's holding us up now. We can't be opening "push to master" on every repo for our people to get around this...

[zrnsm]

Seeing the same issue. "Squash and merge" fails, and my main repository is polluted with merge commits. It took me several tries to convince myself that I wasn't mis-clicking or fat fingering something. Infuriating.

This needs to be fixed now.

[redkean]

i thought i was misclicking & i had to disable merge commit & rebase commit in the settings just to make it do "squash and merge"

[fureweb-com]

I hate merge commits. please fix this 😢

[spiltcoffee]

It's possible to workaround this using the GitHub CLI for now: https://cli.github.com/manual/gh_pr_merge

[JakeShirley]

Also seeing it. We have Squash Merge and Rebase Merge and Rebase Merging always uses Squash.

I though it was a bug in Firefox before finding this bug :P

[amritalaiqa]

Also seeing this. Please fix it.

[kozuka-hayato-ab]

I'm experiencing this problem with some members of my project. I sincerely hope it will be fixed!

[SinaKarimi7]

I have this issue too and reported here. Last time we can switch back to the old UI at least but now the link is gone.

https://github.com/orgs/community/discussions/143787#discussioncomment-12458157

[huksley]

Yes I have the same issue in private project, and I have merge commits disabled 👀

[Kahiis]

Just chiming in, I've also encountered this issue, on 2 different repos. I'm reliably able to reproduce the same issue as @andypearson on a private repo, but when I invited another member to that repo they were able to complete the PR with a rebase and merge succesfully?

[pajlada]

Yeah it looks like the bug only happens to the unlucky people in the A/B feature flag test merge_box_use_fetch_with_error_handling

[shuckc]

Not all members of our team hit this issue, but some do. For PRs in the same project.

[shivamottaghi]

Have the same issue. 😢

[martingalvan-volue]

This is also affecting us. I see the green merge button was reset to "Merge pull request"; I manually selected "Squash and merge" and still see the individual commits being merged to master with an accompanying merge commit. The same thing happens for "Rebase and merge".

[TheMultii]

Bumping this, infrastructure is on fire for the love of god please fix it

[matburnicki]

Experiencing the same issue. Both "Rebase and merge" and "Squash and merge" work incorrectly and produce merge commits.

[marie-erank]

+1 here

[basti1302]

I see a slightly different behavior: Merge commits are disabled on my repo, only rebase and squash is enabled. I usually use "Rebase and merge". Now when I merge any PR with "Rebase and merge" the PR gets merged as "Squash and merge" instead. Not sure why, since everybody else is reporting their PRs are merged with merge commits instead of what they selected..

[pajlada]

The merge method that's usually part of the request is not being transmitted to the server, so from githubs perspective it'll use whatever it thinks is the default merge method. For your repo that's squash and merge, for mine it was merge

[bklein3]

Same here please fix asap

[samus-aran]

Hi everyone! 👋 We appreciate you all taking the time to raise this and bring it to our attention. We have acknowledged there is an incident with the UI for merging & squashing PRs and we are currently investigating. Please see our incident thread to receive updates on its status.

Thank you for your patience, and we appreciate your understanding!

[stherold]

The issue seems to be fixes - it worked again for me 👍

[Blackjacx]

Take it with a grain of salt 😕

https://github.com/orgs/community/discussions/153681#discussioncomment-12460919

[doctor1i1]

Select Topic Area

Bug

Body

In a project that allows both the Merge method and the Squash & Merge method, if I try to use the Squash & Merge method, it uses the Merge method anyway.

It looks like this might be related to the feature flag merge_box_use_fetch_with_error_handling which looks like it causes the data: MutationData to not be sent along in the request

Workarounds you can try

• Disable the unwanted commit types in your repo
• Use the GitHub CLI to merge the PRs

[github-actions[bot]]

💬 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 ⏩

• Your input will be carefully reviewed and cataloged by members of our product teams. 
  • Due to the high volume of submissions, we may not always be able to provide individual responses.
  • Rest assured, your feedback will help chart our course for product improvements.
• Other users may engage with your post, sharing their own perspectives or experiences. 
• GitHub staff may reach out for further clarification or insight. 
  • We may 'Answer' your discussion if there is a current solution, workaround, or roadmap/changelog post related to the feedback.

Where to look to see what's shipping 👀

• Read the Changelog for real-time updates on the latest GitHub features, enhancements, and calls for feedback.
• Explore our Product Roadmap, which details upcoming major releases and initiatives.

What you can do in the meantime 💻

• Upvote and comment on other user feedback Discussions that resonate with you.
• Add more information at any point! Useful details include: use cases, relevant labels, desired outcomes, and any accompanying screenshots.

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. ⭐