Uploaded image for project: 'Bitbucket Cloud'
  1. Bitbucket Cloud
  2. BCLOUD-16338

Option for "--squash --ff-only" merge strategy

XMLWordPrintable

    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

      Squash, fast-forward only (--squash --ff-only): If the source branch is out of date with the target branch, reject the merge request. Otherwise, combine all commits into one new non-merge commit on the target branch

      Use case :
      A pull request rebased on master branch contains one feature commit plus some code improvement introduced by the review process.

      This give us the Following configuration :

      #!git
      
                         D---D'---D''  Feature-XYZ
                       /
          A---B---C  master
      
      

      that should be merged as

      #!git
      
          A---B---C ---D master
      
      

            Unassigned Unassigned
            981fce4d3c1f Cyril F
            Votes:
            48 Vote for this issue
            Watchers:
            30 Start watching this issue

              Created:
              Updated: