Merge methods per branch

[BenLorantfy]

It would be great if "allowed merge methods" were configurable per branch. This would allow workflows such as:

• I only want to allow squash merging into a "dev" branch
• I only want to allow merge commits from dev -> main

I believe this is a common workflow to have a "development" or "release" branch. Often we only want to allow squash merging into these branches to squash poor git histories.

However, when we want to "release" by merging "dev" / "release" into "main" then we don't want to squash merge, otherwise all the granular history is lost.

[marcofugaro]

Same for me, my team is accidentally squashing commits to main.
The commits on dev are already squashed for feature, so all that info is lost.

[raurir]

This would be ideal for our team too.

[sam-w]

Absolutely, this would be an incredibly useful feature for us

[studoo]

This is exactly what our team wants to do. Makes it easier for everyone to not need to do a manual squash (which can be quite easily forgotten)

[nachozullo]

Same here, this is what our team need!

[KATT]

We had a new major of tRPC brewing for >6 months and it was a massive pain point for us to keep the branches up-to-date.

What we wanted was to:

• have the main branch to "Allow squash" only, &
• the next-major-branch to "Allow merge" only

[mskreativ]

+1

I need to define allowed and default merge method individually for some named branches.

[ChelseaMD]

+1

[chase-rg]

+1, this would be useful

[sh-ravan]

+1, need this badly

[calvinzikakis-vizio]

+100 how is this not a feature still

[galamit86]

+1

[iamtodor]

We are lacking this feature. This is very handy to use when following the git flow strategy or hotfix branch policy

[calvinzikakis-vizio]

Duplicate of https://github.com/orgs/community/discussions/20583

[katylava]

I'd say the discussion is a duplicate of the issue, but everyone should definitely upvote both (with the upvote button, not a +1 comment).

Looks like the discussion is getting more traction so more upvotes there are probably more helpful.

This issue:

The discussion:

[sxmanton]

Default merge strategy per branch is a little different from enabling/disabling per branch. Both would be good. There is also this one with a large number of upvotes, which is asking for a subset of the feature requested here (disable squash and merge per branch) https://github.com/orgs/community/discussions/10809

[BenLorantfy]

I raised this issue 6 months before https://github.com/orgs/community/discussions/20583 so if anything https://github.com/orgs/community/discussions/20583 is a duplicate of this issue

I agree with upvoting both though