Preserve linear commit history with merge

[Jamie Eisenhart]

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.

[Saxea _Flowie_]

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