Sync feature branches via rebase (BB-7369)

Issue #6202 open
Timothy Kovalev created an issue

Allow to choose which method to use when syncing feature branches: merge or rebase.

When using 'git rebase master' command in feature branch instead of 'git merge master', we'll get a linear history in feature branch, which is widely used in development, and considered a better way than lot of merging.

Comments (36)

  1. Michael Frauenholtz staff

    I've added this to our internal issue tracker for further investigation. We'll let you know what we come up with, and post any updates here.

    Cheers, Michael

  2. Florian Schmaus

    It would be great if pull requests would contain an rebase button, that when clicked tries to rebase the changes. The rebase action could provide feedback if it was successful or not, leaving the user with the choice to try a merge, which will also likely fail, or a manual rebase instead.

    Some, maybe even most, pull requests are trivial. If I had the rebase button I could save a lot of merge commits ( http://stackoverflow.com/questions/16358418/how-to-avoid-merge-commit-hell-on-github-bitbucket ).

  3. Mauricia Ragland

    I would love this feature...as of now I'm just approving and manually rebasing. I don't like messy branches, especially if it's unnecessary.

  4. Mikael Lepistö

    +10 also support for actually option for preventing merge of pull request unless it is rebased to top of destination would be awesome

  5. Chris Pennycuick

    We would also love this feature. We recently moved from Stash Server to BitBucket Cloud, and this basically the only issue we now have.

  6. Paul Vu

    Having the option to enable/disable either the "merge" or "rebase" options on pull requests per repo would be helpful too.

  7. Dan Bonachea

    +100

    Many projects require maintaining a linear history in their repo, which means rebasing all PRs before merge.

    Please either give us a button to do the RIGHT thing, or at the very least an option to disable the seductive buttons that do the WRONG things (the blue-pill-shaped-buttons are a doorway to merge hell).

  8. Soan Saini

    +100 for this. This feature is required. Should be high on priority. Dont tell me to merge always when i click on Sync. I dont want to do that.

  9. Ryan Fisher

    Please either give us a button to do the RIGHT thing, or at the very least an option to disable the seductive buttons that do the WRONG things (the blue-pill-shaped-buttons are a doorway merge hell).

    This times a million

    Seriously, at least let us disable the "sync" button. I am tired of getting into arguments with coworkers because they're lazy and will never be the ones that have to unravel 15 branches all with redundant merge commits when something goes wrong so they click that abomination of a feature "sync".

  10. Remo Meier

    yes, github has it. makes project using bitbucket look ugly as hell when looking at their commit history.

  11. Log in to comment