-
Suggestion
-
Resolution: Unresolved
-
None
-
None
-
0
-
Currently, Bitbucket supports the configuration of only one default merge strategy for all branches.
We would like to have the ability to setup merge strategy per branch.
Reasoning: Only having one default merge strategy for all branches makes a lot of issues and human mistakes because we need to merge from feature to dev by squash from dev to stage by fast forward and from stage to master fast forward.
Developers a lot of times by mistake use inappropriate merge strategy and generate tons of conflicts for next iteration.
Give the option of something similar to the following:
"Require Squashed Merges Into:
Override: Yes
[x] Default [x] Development [x] Production [x] Release Branches
This setting forces squashes for all merges coming into those branches (based on the repo's branching model), merges between those branches do not require squashes."