Uploaded image for project: 'Bitbucket Data Center'
  1. Bitbucket Data Center
  2. BSERV-10250

Choosing merge strategy of a Pull Request based on the source branch



    • Suggestion
    • Resolution: Unresolved
    • None
    • None
    • 8
    • We collect Bitbucket feedback from various sources, and we evaluate what we've collected when planning our product roadmap. To understand how this piece of feedback will be reviewed, see our Implementation of New Features Policy.


      We have a workflow where any pull request from a feature branch to development branch (master) will have to be merged using "Squash" commit. We also have a separate production branch (release) from where our release builds are generated.

      We have added a rule to not allow any modifications without a Pull Request on both master and release. When we have to make a new release, we would like to create a pull request from master to release branch. But if the merge strategy is "Squash", then those 2 branches would diverge.

      So, we would like to make it a "Fast-forward only" merge if the source branch is master. Any merges from hotfix branches to release directly should still be "Squash" commits.

      I know we can choose this option in each pull request individually, but it is error prone and would be more convenient to set it in the merge strategies setting to automatically choose the required type based on the source (and optionally target) branch.




            Unassigned Unassigned
            14678dc6-9f9e-4f65-abc9-d75f7673ec58 Deleted Account (Inactive)
            25 Vote for this issue
            19 Start watching this issue