Disable automatic merge

[Mayke Kloppenburg]

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?

[Balázs Szakmáry]

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

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

[Balázs Szakmáry]

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

[Tim Crall]

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

 

[Balázs Szakmáry]

Pull with rebase does not do merge.