Is there a way to achieve fast-forward merge in SourceTree?

As discussed in this post: http://ariya.ofilabs.com/2013/09/fast-forward-git-merge.html, if we still want to do fast-forward merge when possible, how to do that in SourceTree? I tried both merge in SourceTree and GitHub pull request from web, both shows non-ff merge in the graph.

Thanks

Jirong

2 answers

1 accepted

(in addition to @Tim Crall )

Check your global git settings in SourceTree. There is a flag called "use rebase instead of merge by default for tracked branches"

 Bildschirmfoto 2016-02-01 um 07.52.16.png

This will typically auto-enable the checkbox below in the pull dialog/popup:

Bildschirmfoto 2016-02-01 um 07.51.13.png

 

turn off if you want to auto-detecting best (git default merge without options).

turn on the field above if you want to force a merge point, this is typically what you want when you close feature branches.

The following options will do the job:

st.png

Check your "Git" settings in SourceTree and make sure "Do not fast-forward when merging, always create a commit" is not checked.

Screen Shot 2016-01-29 at 11.11.34 AM.png

It is not checked. So uncheck this option only doesn't do the job.

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

723 views 0 4
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you