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

Option for "rebase + merge --ff-only" merge strategy

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

      Bitbucket Server already provides this:

      Rebase, fast-forward (rebase + merge --ff-only): Commits from the source branch onto the target branch, creating a new non-merge commit for each incoming commit. Fast-forwards the target branch with the resulting commits

       


      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-16610] Option for "rebase + merge --ff-only" merge strategy

            Pinned comments

            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

            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

            Please implement this! It shouldn't take that long, simply do:

            git rebase ${DESTINATION_BRANCH}
            [[ $? -ne 0 ]] git merge --ff-only

            Can't be that hard right??

            Sam Jaques added a comment - Please implement this! It shouldn't take that long, simply do: git rebase ${DESTINATION_BRANCH} [[ $? -ne 0 ]] git merge --ff-only Can't be that hard right??

            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 )

            eyforia added a comment -

            dgarcia@atlassian.com we'll be moving away from a commercial Bitbucket account to Github, in part because of this feature missing in Bitbucket.

            eyforia added a comment - dgarcia@atlassian.com we'll be moving away from a commercial Bitbucket account to Github, in part because of this feature missing in Bitbucket.

            Agreeing with all the comments below. Providing rebase merge features (with or without fast-forward), is essential for keeping a linear git history if you don't want to be be manually rebasing all day long.

            Please work on this!

            Germain Dudekem added a comment - Agreeing with all the comments below. Providing rebase merge features (with or without fast-forward), is essential for keeping a linear git history if you don't want to be be manually rebasing all day long. Please work on this!

            Hi, we just moved to Bitbucket Cloud, and this missing feature is very annoying ! 

            Our developers have sometimes to wait for 30 minutes just to merge their PR because of this.

            We need this back !

            Gaël Migliorini added a comment - Hi, we just moved to Bitbucket Cloud, and this missing feature is very annoying !  Our developers have sometimes to wait for 30 minutes just to merge their PR because of this. We need this back !

            Saxea _Flowie_ added a comment - - edited

            We have released a plugin for Bitbucket cloud that supports rebase strategy and other features.

             

            Saxea _Flowie_ added a comment - - edited We have released a plugin for Bitbucket cloud that supports rebase strategy and other features.  

            Those things that gets released in two years are solely around pipelines, and one item on project level branch permissions.

            Such a thin roadmap does not feel like being listened to, but mostly feels like Atlassian is exploiting its vendor lock-in. Especially when reading that apparently the featureset of the Cloud version goes down when migrating from Server.

            Richard van Laak added a comment - Those things that gets released in two years are solely around pipelines, and one item on project level branch permissions. Such a thin roadmap does not feel like being listened to, but mostly feels like Atlassian is exploiting its vendor lock-in. Especially when reading that apparently the featureset of the Cloud version goes down when migrating from Server.

            Patrik Neefe added a comment - - edited

            @dgarcia Why was this feature (and so many others) that worked well in Bitbucket server removed/left out from the cloud version? Bitbucket Cloud feels like a purposefully feature-poor alternative to Bitbucket server, and this is just sad.

            Patrik Neefe added a comment - - edited @dgarcia Why was this feature (and so many others) that worked well in Bitbucket server removed/left out from the cloud version? Bitbucket Cloud feels like a purposefully feature-poor alternative to Bitbucket server, and this is just sad.

            @dgarcia this is extremely disappointing. We have migrated one team to the cloud version of Bitbucket and put all other project migrations on hold.

            So far the only upside to migrating any developers to cloud has been freeing up server licences. We've now got a dev chat channel dedicated to the pointless double handling required to avoid manual rebases all day long.

            Will this functional regression between the server and cloud versions be fixed before support for server ends?

            Tobin Richard added a comment - @dgarcia this is extremely disappointing. We have migrated one team to the cloud version of Bitbucket and put all other project migrations on hold. So far the only upside to migrating any developers to cloud has been freeing up server licences. We've now got a dev chat channel dedicated to the pointless double handling required to avoid manual rebases all day long. Will this functional regression between the server and cloud versions be fixed before support for server ends?

              dparrish Dave Parrish [Atlassian]
              morepleasure ifeltsweet
              Votes:
              392 Vote for this issue
              Watchers:
              158 Start watching this issue

                Created:
                Updated:
                Resolved: