Disable "Squash and merge" on some specific branches #10809
Replies: 378 comments 95 replies
-
+1 We want to enforce We have resorted to using memes to try to get everyone to remember to apply the right merge type for the right branch:
|
Beta Was this translation helpful? Give feedback.
-
+1. same exact use case. there are so many options in the "Branch protection rules" I was surprised this wasn't one of them (and also it seems like a good place to hang this feature) |
Beta Was this translation helpful? Give feedback.
-
+1 This seems like a pretty normal use case. |
Beta Was this translation helpful? Give feedback.
-
+1 Our team would like to configure merge strategy for each branch separately as well |
Beta Was this translation helpful? Give feedback.
-
+1 I really would like to set merging strategies per branch – same way as it is possible now for the whole repository. For benchmark: Azure Repositories does it really well. Other things are far worse, but this is where they're superior in my opinion. |
Beta Was this translation helpful? Give feedback.
-
Branch protection rules appears to be the right place to define this. Github, please reach out if you are looking for beta testers for this feature request. ;-) |
Beta Was this translation helpful? Give feedback.
-
Yes, this keeps biting us as well. GitHub... please hear our cries! |
Beta Was this translation helpful? Give feedback.
-
This would be a great feature. The number of times people on our team accidentally squash merge to master, then I'm forced to resolve conflicts on develop...urgh! |
Beta Was this translation helpful? Give feedback.
-
+1. We've been promoting branches associated with environments so dev->stg->prod and it would be great to enforce squash merge into dev and disable squash merge for stg and prod. |
Beta Was this translation helpful? Give feedback.
-
It persists the button as whatever last one you used, which makes this really easy to flub. Then the poor sucker who has to do the next merge into the deploy branch has a mess to unravel. |
Beta Was this translation helpful? Give feedback.
-
Thanks a lot those who showed interests in this feature request! |
Beta Was this translation helpful? Give feedback.
-
Guys, spamming the main thread like little kids won't help the matter in any way. What's worse, it is burying the actual constructive debate inisde into the "Load more replies" button. There's an upvote button on the original post - use that. A GitHub associate has already replied and gathered feedback and it seems like they're trying to find a way how to prioritize the issue for the next quarter. Given it's already half of Q3, let's hope they actually plan it for Q4 and deliver by the end of the year (here's the actual roadmap, last I checked it was still not there 😢). As much as we'd love that feature ourselves, there's no point in spamming this thread every two hours, it's not gonna make anyone deliver the feature faster. |
Beta Was this translation helpful? Give feedback.
-
AHHI it happened again! Now I need to do this messy recovery surgery. Please guys we need this ASAP. |
Beta Was this translation helpful? Give feedback.
-
Is it possible to stop with the +1s, does the upvote on the main question work the same way as in issues to help devs prioritize? |
Beta Was this translation helpful? Give feedback.
-
Sorry to spoil everyone's party, but I am interested in receiving email updates if anything ever happens with this feature. I'm really not interested in the endless spammy +1 comments. Vote on the initial issue, leave the inboxes of the several hundred people interested in this alone. |
Beta Was this translation helpful? Give feedback.
-
+1, how is this not implemented? This has been a valid use case, and a hugely painful if done by accident. |
Beta Was this translation helpful? Give feedback.
-
+1 - just felt this pain today |
Beta Was this translation helpful? Give feedback.
-
This would be a great feature. |
Beta Was this translation helpful? Give feedback.
-
+1 I found something similar while they don't push it for us:
Now all the PR for the pattern you created won't allow using the |
Beta Was this translation helpful? Give feedback.
-
Hi,
I'm now building a deploy workflow for a monorepo, and trying to set up a CI workflow triggered by a push to a special branch (like
production
) for deployment. We currently merge regular PRs to the main branch using "Squash and merge" by enabling "Require linear history" option, and merging "deploy" PRs to the production branch with "Create a merge commit" in order to avoid unexpected divergent.It works, but not perfect because "Squash and merge" button is present when merging a PR to the production branch.
As far as I searched, I couldn't find a good way to enforce developers to use "Create a merge commit".
Is there a good way to achieve that?
So far, I could find a stackoverflow saying it's not possible.
Thanks in advance!
Beta Was this translation helpful? Give feedback.
All reactions