Only allow merging pull requests with no-ff and when fast forwaring (-ff-only) is possible

[Niclas Jonsson]

Hi,

I wish to force the "no-ff" option when merging a pull request (which is possible), but I also wish to only allow a pull request merge when fast forwaring is possible.

Simply put:

How to achieve `git --no-ff --ff-only` for a pull request. See dicussion on stackoverflow

[Julius Davies [bit-booster.com] · Accepted solution]

If you're on Bitbucket Server, our free Control Freak add-on is one way to accomplish exactly this.

Check the branches you want to apply this to under Control Freak's "Require Fast-Forwardable Merges Into" control.

Note:  the set of all checked branches becomes a kind of equivalence class inbetween which regular merges are permitted.   The fast-forward check only applies to merges that originate from branches outside the set of checked branches.

[jredmond]

Are you asking about Bitbucket Cloud or Bitbucket Server?