Uploaded image for project: 'Bitbucket Data Center'
  1. Bitbucket Data Center
  2. BSERV-7981

Merging using rebase is not available into main/master branch

XMLWordPrintable

    • Icon: Suggestion Suggestion
    • Resolution: Duplicate
    • None
    • None
    • None
    • We collect Bitbucket feedback from various sources, and we evaluate what we've collected when planning our product roadmap. To understand how this piece of feedback will be reviewed, see our Implementation of New Features Policy.

      As part of our workflow we want to rebase rather than merge into our main develop/master branch, however through Stash there is only an option to merge a pull request which means we need to make sure all pull requests are rebased before the merge. It would be nice to be able to choose to merge using a rebase through Stash as this would tidy/speedup our workflow.

        1. rebase.png
          rebase.png
          38 kB
        2. 2017-08-01-hooks-cropped.png
          2017-08-01-hooks-cropped.png
          90 kB

            [BSERV-7981] Merging using rebase is not available into main/master branch

            Julius Davies [bit-booster.com] added a comment - - edited

             

            My paid add-on (Bit-Booster - Rebase Squash Amend) does exactly what you described:

             

            #1.  Enable the "Bit-Booster Require Fast-Forwards Hook" to enforce a rebase workflow.  (Note:  Pull-requests between production, master, and release/** do not require rebases.  The add-on checks your branching model to see what branches should be rebased, and which should not). 

             

             

            #2.  Click on the Rebase Button provided by Bit-Booster:

             

            Note:  you don't have to enable the hook to use the rebase button.    The hook just helps enforce a rebase workflow, but the button is always available.

             

             

             

             

            Julius Davies [bit-booster.com] added a comment - - edited   My paid add-on ( Bit-Booster - Rebase Squash Amend ) does exactly what you described:   #1.  Enable the "Bit-Booster Require Fast-Forwards Hook" to enforce a rebase workflow.  (Note:  Pull-requests between production, master, and release/** do not require rebases.  The add-on checks your branching model to see what branches should be rebased, and which should not).      #2.  Click on the Rebase Button provided by Bit-Booster:   Note:  you don't have to enable the hook to use the rebase button.    The hook just helps enforce a rebase workflow, but the button is always available.        

              Unassigned Unassigned
              a84825c9556e Barclays Vendor Management
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Created:
                Updated:
                Resolved: