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 (28)

  1. 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 ).

  2. 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 merge hell).

  3. Soan

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

  4. Log in to comment