Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

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

Niclas Jonsson
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 12, 2018

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

2 answers

1 accepted

0 votes
Answer accepted
Julius Davies [bit-booster.com]
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 12, 2018

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.

0 votes
jredmond
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
August 12, 2018

Are you asking about Bitbucket Cloud or Bitbucket Server?

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events