Add option to only allow merge if fast-forward merge is possible

Issue #14210 closed
Paul Wagland
created an issue

What I am looking for is something similar to the GitLab functionality:

Merge commit with semi-linear history

A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible. This way you could make sure that if this merge request would build, after merging to target branch it would also build. When fast-forward merge is not possible, the user is given the option to rebase.

As far as I can see, this is currently not possible to configure in Bitbucket. Further I would like a setting that I can use to enforce this in the UI.

Comments (6)

  1. Alastair Wilkes staff

    Now that #6106 is done and fast-forward merges are available, we would achieve the requested outcome by shipping #14244 (Allow administrators to choose which merge strategies are allowed to be chosen). Shipping that capability would let you select fast-forward as the only merge strategy, which would obviously prevent merges that could not be fast-forwarded.

    So please follow that ticket for updates on when this will be possible.

  2. Log in to comment