Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Preserve linear commit history with merge

Jamie Eisenhart
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
August 3, 2023

I'd like to preserve a linear commit history when merging pull requests (no merge commits). How would I do that with bitbucket cloud? My preference would be to use the Rebase, fast-forward merge strategy, but that's not available in our cloud repo settings. Instead we have to use Fast forward, which causes merge failures whenever another PR has landed, even if it is completely non-conflicting.

1 answer

1 vote
Saxea _Flowie_
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
August 3, 2023

@Jamie Eisenhart Indeed, Bitbucket Cloud does not have built-in support for rebase, but you can utilize Flowie, an addon that offers rebase strategies. Additionally, Flowie enables you to enforce a specific strategy for all PRs, ensuring they are merged using your chosen approach.


Disclaimer: I work for the company that develops Flowie.

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events