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

As a Stash user I want to use a rebase workflow with Stash and for my Pull Requests

XMLWordPrintable

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

      Atlassian status as of December 2016

      Hi everyone,

      Thanks for voting and commenting on this suggestion. Your input in the comments helps us understand how this affects you and what you're hoping to accomplish with Bitbucket Server.

      There's definite interest in offering this functionality; the broader team have had quite a few conversations about it. Unfortunately, at the moment, there are significant technical challenges to overcome for server-side rebases to be viable. We have to keep instances that use pull requests heavily in mind, and the additional load of rebase operations is likely to significantly impact their scalability.

      While it's unlikely that we'll be able to address this suggestion in the near future, we will continue to regularly consider how and when we might.

      Product feedback is collected from a number of different sources and is evaluated when planning the product roadmap. You can learn more about our process here.

      Norman Ma

      Product Manager - Bitbucket Server

      Original request description

      As a Stash user, I would prefer to use a rebase workflow vs. a merge workflow for my Pull Requests.

      This workflow permits to automatically obtain the following:

      • When a PR is being merged:
        • Condense (squash/rebase) all the commits in the source branch in a single one and leave that single commit on the branch
        • Create a new merge commit on the target branch

      So for every PR merged the expected outcome will be:

      • One commit on the source branch containing ALL the changes made on the branch
      • One commit on the target branch for the merge itself

      For more information on rebase workflows, please see:

      This is related to STASH-2873.

      Jordan Dea-Mattson

        1. rebase.png
          rebase.png
          57 kB
        2. rebase-latest.png
          rebase-latest.png
          58 kB
        3. rebase-merge-strategies.png
          rebase-merge-strategies.png
          9 kB
        4. rebase-ref-sync.png
          rebase-ref-sync.png
          33 kB
        5. Screen Shot 2016-11-23 at 08.16.27.png
          Screen Shot 2016-11-23 at 08.16.27.png
          65 kB
        6. squash-latest.png
          squash-latest.png
          86 kB

              Unassigned Unassigned
              c48851d1e21b Numenta Admins
              Votes:
              340 Vote for this issue
              Watchers:
              181 Start watching this issue

                Created:
                Updated:
                Resolved: