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

Feedback for squash merges

    XMLWordPrintable

Details

    • 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.

    Description

      This is a placeholder ticket to gather feedback for the squash merge labs feature. The reason for a separate feedback ticket is to not spam people in the original ticket who just want the feature but don't want to be involved in further discussion.

      What currently works

      • Pull request merge dialog contains a dropdown that can be used to choose between having a merge commit and just squashing all your commits on top of the destination.
      • The default commit message changes based on how one wants to do the merge. In the case of squash merges, we use a combination of the commit messages of all the commits being squashed. Obviously, the user should probably edit this commit message, but the default is a good start.

      Known missing functionality

      • The merge dialog in the branch details page, branch list page and compare page does not yet support squashing. These will be rolled out in the coming weeks. (done)
      • Mercurial support for squash merges is planned, but will be implemented after all the merge dialogs are fixed. (we're planning on supporting obsolescence markers for this, so it'll be split into a separate beta feature later).
      • API support is missing.
      • Public documentation has not been updated yet (obviously this should be the last task).

      Attachments

        1. 2271370725-squash-merge.png
          2271370725-squash-merge.png
          44 kB
        2. 3476750032-squash.png
          3476750032-squash.png
          14 kB
        3. 539451252-2017-02-10-13-42-32.png
          539451252-2017-02-10-13-42-32.png
          57 kB
        4. Screen Shot 2016-12-14 at 19.03.08.png
          Screen Shot 2016-12-14 at 19.03.08.png
          198 kB

        Activity

          People

            achhabra@atlassian.com Abhin Chhabra (Inactive)
            achhabra@atlassian.com Abhin Chhabra (Inactive)
            Votes:
            0 Vote for this issue
            Watchers:
            18 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: