It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Disable automatic merge

Mayke Kloppenburg May 12, 2015

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

1 vote
Balazs Szakmary May 12, 2015

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

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

Balazs Szakmary May 12, 2015

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

0 votes
Tim Crall May 12, 2015

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

 

Balazs Szakmary May 12, 2015

Pull with rebase does not do merge.

Suggest an answer

Log in or Sign up to answer
This widget could not be displayed.
This widget could not be displayed.
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

391 views 0 9
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you