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

Provide "rebase + merge --no-ff" option for pull requests

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.

      Currently, Bitbucket cloud doesn't support "rebase + merge --no-ff" option for pull requests. Lacking of this option leads to non-linear commit histories since, we have multiple pull requests from multiple developers to our repositories in a regular day.

       

      Latest update from Atlassian 2024-09-30

      We've added support for the following additional merge strategies:

      It's also now possible to sync a feature branch via rebase (BCLOUD-6202).

      https://bitbucket.org/blog/branch-sync-merge-rebase

          Form Name

            [BCLOUD-17881] Provide "rebase + merge --no-ff" option for pull requests

            Pinned comments

            Dave Parrish [Atlassian] added a comment -

            We've added support for the following additional merge strategies:

            It's also now possible to sync a feature branch via rebase (BCLOUD-6202).

            https://bitbucket.org/blog/branch-sync-merge-rebase

            Dave Parrish [Atlassian] added a comment - We've added support for the following additional merge strategies: Rebase + fast forward ( BCLOUD-16610 ) Rebase + merge ( BCLOUD-17881 ,  BCLOUD-19186 ) Squash, fast forward only ( BCLOUD-16338 ) It's also now possible to sync a feature branch via rebase ( BCLOUD-6202 ). https://bitbucket.org/blog/branch-sync-merge-rebase

            All comments

            Dave Parrish [Atlassian] added a comment -

            We've added support for the following additional merge strategies:

            It's also now possible to sync a feature branch via rebase (BCLOUD-6202).

            https://bitbucket.org/blog/branch-sync-merge-rebase

            Dave Parrish [Atlassian] added a comment - We've added support for the following additional merge strategies: Rebase + fast forward ( BCLOUD-16610 ) Rebase + merge ( BCLOUD-17881 ,  BCLOUD-19186 ) Squash, fast forward only ( BCLOUD-16338 ) It's also now possible to sync a feature branch via rebase ( BCLOUD-6202 ). https://bitbucket.org/blog/branch-sync-merge-rebase

            Dave Parrish [Atlassian] added a comment -

            We're working on adding support for several additional merge strategies, including:

            Dave Parrish [Atlassian] added a comment - We're working on adding support for several additional merge strategies, including: Rebase + fast forward ( BCLOUD-16610 ) Rebase + merge ( BCLOUD-17881 ,  BCLOUD-19186 ) Squash, fast forward only ( BCLOUD-16338 )

            Denise Garcia added a comment -

            Hello everyone,

            My name is Denise and I am a Product Manager on Bitbucket Cloud. I appreciate your input and understand the benefit of merging via rebase for certain workflows. To set the right expectations, we will not be addressing this feature in the near term.

            We are committed to keeping you up to date on this ticket as openness and transparency is important to us even if the news we are sharing is upsetting. You can find our public roadmap [here|https://www.atlassian.com/roadmap/cloud?selectedProduct=Bitbucket].

            Please continue to upvote this ticket in the meantime and also share details about your workflows that will help us design the best possible solution once this is prioritized.

            Cheers,
            Denise Garcia

            Denise Garcia added a comment - Hello everyone, My name is Denise and I am a Product Manager on Bitbucket Cloud. I appreciate your input and understand the benefit of merging via rebase for certain workflows. To set the right expectations, we will not be addressing this feature in the near term. We are committed to keeping you up to date on this ticket as openness and transparency is important to us even if the news we are sharing is upsetting. You can find our public roadmap [here| https://www.atlassian.com/roadmap/cloud?selectedProduct=Bitbucket ]. Please continue to upvote this ticket in the meantime and also share details about your workflows that will help us design the best possible solution once this is prioritized. Cheers, Denise Garcia

            skim3 added a comment -

            +1

            skim3 added a comment - +1

            bonachea added a comment - - edited

            This appears to be a duplicate of issue 6202: https://jira.atlassian.com/browse/BCLOUD-6202

            bonachea added a comment - - edited This appears to be a duplicate of issue 6202: https://jira.atlassian.com/browse/BCLOUD-6202

            Tomislav Milković added a comment -

            +1

            Tomislav Milković added a comment - +1

            Leonardo Medici added a comment -

            +1

            Leonardo Medici added a comment - +1

            Chuxin Zhao added a comment -

            +1

            Chuxin Zhao added a comment - +1

            YS added a comment -

            GitLab and Azure Devops already have this feature.

            YS added a comment - GitLab and Azure Devops already have this feature.

            waldyrious added a comment -

            I believe this is a duplicate of issue 12914.

            waldyrious added a comment - I believe this is a duplicate of issue 12914 .

              dparrish Dave Parrish [Atlassian]
              oocal@atlassian.com Alper
              Votes:
              47 Vote for this issue
              Watchers:
              21 Start watching this issue

                Created:
                Updated:
                Resolved: