The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

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

Is there a merge strategy that combines --no-ff and --ff-only?

bracco23
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!
February 19, 2020

I was looking at merge strategies for pull requests and I did not find one that satisfied my need.

What I want is to block each pull request unless they are ahead of the target branch, making it a candidate to be merged in --ff-only mode, but actually always create the merge commit regardless, so basically the pull request should be treated as --ff-only but the actual merge should be performed as if the option --no-ff is passed, kinda like the option squash + --ff-only but without the squashing.

Is there anything similar? Would it be an interesting merge strategy?

0 answers

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

TAGS
AUG Leaders

Atlassian Community Events