How to disable the squash and merge for particular branch in repository .

[upadhyayanuj05]

Select Topic Area

Question

Body

I have 2 branches 'main' and 'develop' i want to disable the squash and merge for main branch while enable for develop branch.

[gebeto]

@Majid-J Is this instruction generated by ChatGPT? Because there are no Merge options section and Allow squash merging option

[ChristianSch]

I reported this as spam as the information is obviously wrong and has sadly reached google search as the top answer for me.

[gebeto]

How you did that? I don't see Merge options section in Branch protection. Can you please share a screenshot of this section from your branch protection settings?

[CdrMarks]

@jackyyy65 can you share how you were able to disable a merge type for one branch?

[ZiViZiViZ]

No he can not because he is lying and probably not even a real account.
He is just a troll that have no repos in his account and has nothing better to do than trolling people online.

[sarathkumar-s]

whats your default branch? it is main or develop ?

[sarathkumar-s]

I don't think we have merge strategies according to the branch but you have the options to choose between the below three when you are merging. These 3 options will appear only when you have enabled in the repo settings -> general -> pull request

1. create merge commit
2. squash and merge
3. rebase and merge

[gebeto]

This setting is applying to the whole repo, not to separate branches

[sarathkumar-s]

yes, you need to choose from them while creating PR.

[gebeto]

yes, but the question is to allow Squash and merge to dev branch, but restrict it to main branch

[Boopathiraj]

I am also on same page where @gebeto is.
@gebeto if you got any solution, pls post

[gebeto]

Unfortunately I have no any solution for this, should wait while Github implement it, because looks like github just don't have this feature implemented, so we need to wait for the GitHub to do it

[millent-wiq]

I guess the below addresses the opposite problem - disabling merge commits for a branch, while allowing it for others. Still might be useful for some who don't want to have branches polluted by a multitude of commits but still need to merge when promoting code from one brach to another.

Protecting a particular branch from merge commits can be done by selecting the Require linear history option on the branch protection rules. In this way, the pull requests will stop you from performing a merge commit for the particular branch.

[ArtemGoutsoul]

Just an update for anyone who finds this discussion:

• Squash commits still cannot be disabled for a branch (only for the whole repo: disable "Allow squash merging" in General Settings).
• Merge commits can be disabled per branch ("Require linear history" branch setting)

Hopefully GitHub addresses this eventually. I have done accidental squash commits on a branch where I didn't want them, which is a hassle to fix...

[raghuvanshkapur]

We are victims of the same problem and GitHub just doesn't seem to listen.

When such a squash commit does happen to a deploy or release branch, how do you fix it? I'm curious if there is an efficient way. Usually we have to bear the after affects of this accident while doing the subsequent merge which is a pain.

[ArtemGoutsoul]

@raghuvanshkapur The easiest way I've found so far to fix the accidental squash commit is to delete and recreate the release branch.

[lizziemac]

I think it would be ideal to allow each merge strategy to be restricted based on branch rules (which would overrule the repo sets), e.g.:

• only allow squash and merge for branches like main
• only allow rebase and merge for branches release/*
• only force linear history for branch devel

If a repo only has "squash and merge" selected, but then the release branch ruleset has "rebase and merge", perhaps rebase and merge is only enabled for the release branch. I do think that the repo settings would need to have a little note mentioning what branch rules override the repo rules (e.g. "You don't have 'rebase and merge' enabled, but these rulesets do. To change that, please modify the rulesets")

[Louai-Abdelsalam]

Looks like they'll be implementing this feature hopefully before the end of the year https://github.com/orgs/community/discussions/10809#discussioncomment-10329765

[github-actions[bot]]

🕒 Discussion Activity Reminder 🕒

This Discussion has been labeled as dormant by an automated system for having no activity in the last 60 days. Please consider one the following actions:

1️⃣ Close as Out of Date: If the topic is no longer relevant, close the Discussion as out of date at the bottom of the page.

2️⃣ Provide More Information: Share additional details or context — or let the community know if you've found a solution on your own.

3️⃣ Mark a Reply as Answer: If your question has been answered by a reply, mark the most helpful reply as the solution.

Note: This dormant notification will only apply to Discussions with the Question label. To learn more, see our recent announcement.

Thank you for helping bring this Discussion to a resolution! 💬