I would like to enforce a merge strategy on a per-branch basis in Bitbucket

Chris Gamache

I can enforce a merge strategy per project, but we need to change the merge strategy at the branch level. We can allow multiple strategies, but the person who does the merge has to be diligent in selecting the correct one. This is most problematic when merging a long-running development branch into our master branch. We squash PR's to the development branch, but we don't want the PR from development to master to be squashed. Relying on the person who is charged with merging from development to master to make that proper choice has not worked out so well for us.

How can we enforce a merge strategy on a per-branch basis?

Julius Davies _GitBoost_com_

Our free add-on, Control Freak for Bitbucket Server, might be able to help you with this specific situation.

For the repo in question, set the following config:

Repo --> Settings --> Control Freak

Require Squashed Merges Into:

Override: Yes

[x] Default   [x] Development   [x] Production   [x] Release Branches

 

And then click "Save Settings."

The neat thing about this setting is that while it forces squashes for all merges coming into those branches (based on the repo's branching model), merges *between* those branches do not require squashes.

You might also want to set Control Freak's "Require Fast-Forwardable Merges Into:" setting for the same branches, to force a squash + rebase workflow.