Loading...

XML

Word

Printable

Details

Type: Suggestion
Resolution: Done
Fix Version/s: 5.5.0
Component/s: Pull Requests
Labels:
- pr-merge

Feedback Policy:

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.

Description

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

Attachments

- Sort By Name
- Sort By Date
- Ascending
- Descending
- Thumbnails
- List

rebase.png
57 kB
19/Dec/2016 7:28 AM
rebase-latest.png
58 kB
03/Jan/2017 8:04 PM
rebase-merge-strategies.png
9 kB
24/Oct/2017 6:21 AM
rebase-ref-sync.png
33 kB
24/Oct/2017 6:22 AM
Screen Shot 2016-11-23 at 08.16.27.png
65 kB
23/Nov/2016 8:16 AM
squash-latest.png
86 kB
03/Jan/2017 8:05 PM

Issue Links

incorporates

BSERV-4211 Allow no-merges policy

Closed

is duplicated by

BSERV-2873 As a Stash user, I want to rebase prior to merging a Pull Request

Closed

BSERV-4084 Enable the ability to rebase a feature branch in a pull request before merge to mainline, without requiring a force push from remote client

Closed

BSERV-4159 Pull request commits should show the parent commit

Closed

BSERV-4815 add git rebase command in a pull request GUI

Closed

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

Closed

is related to

BSERV-9339 Please fix or remove the "Review pull requests at the commit level" feature

Closed

relates to

BSERV-4159 Pull request commits should show the parent commit

Closed

BSERV-6913 Change "declined" to a friendlier verb or add a new pull request status.

Closed

BSERV-8252 Rebase button for Pull-Requests

Closed

mentioned in: Page Loading...; Page Loading...; Page Loading...; Page Loading...; Page Loading...; Page Loading...; Page Loading...; Page Loading...; Page Loading...; Page Loading...; Page Loading...

(1 is duplicated by, 1 is related to, 3 relates to, 11 mentioned in)

Activity

People

Assignee:: Unassigned

Reporter:: Numenta Admins

Votes:: 340 Vote for this issue

Watchers:: 181 Start watching this issue

Dates

Created:: 03/Dec/2012 11:18 PM

Updated:: 19/Sep/2019 5:50 AM

Resolved:: 24/Oct/2017 6:03 AM