Disable automatic merge

This is the situation:

We are working on a project with different branches. Whenever I pull from one branch, sourceTree automatically makes a commit with a branche merge. However, I do not want to merge the branches. The only way to get rid of it is resetting the commit in a command line. Last time sourcetree even managed to create a merge conflict, even though i did not change anything.

How do I disable this?

2 answers

In Tools\Options\Git, set these two the way they are on the screenshot:

image2015-5-12 14:39:54.png

You will still have to merge if your local unpushed changes conflict with the changes you are pulling.

"Pull" inherently implies merge.  I'm not quite sure what you're asking.  If you are saying that you have branch_a and branch_b and branch_a is getting merged into branch_b when you do a pull, then you must be pulling from the branch that isn't checked out.  Try checking out a branch before pulling that branch so that it pulls into the correct branch.

 

Pull with rebase does not do merge.

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 ...

798 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