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?
"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.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG