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

XMLWordPrintable

      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

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

              Created:
              Updated:
              Resolved: