SourceTree aborts merge rather than merge with conflicts

In a very simple set up whenever i PULL from my branch i get 'merge aborted' if there is even a single line conflict in a remote file and my uncommitted changes.

error: Your local changes to the following files would be overwritten by merge

Please, commit your changes or stash them before you can merge.

Sure enough, if i stash my changes or revert them i can perform the PULL just fine but i want to pull the remote file changes and have them as conflicts which i can resolve locally before committing. I can't seem to find an option for that anywhere.


SourceTree for Windows
Diff tool and Merge tool configured: P4Merge

2 answers

1 accepted

For anyone interested, it seems that SourceTree has a different approach on this.

When PULLing in Android Studio, Android Studio stashes and pulls behind the scenes (you can see the console logs) and then shows conflicts.


So, a developer has to manually perform these steps in SourceTree to achieve the same result. Stash the changes, PULL safely and then Unstash to merge the changes

It seems you were trying to pull with uncommitted local changes.  It wants you to commit your changes first so that it can put your repo is a previous state in case you want to cancel the merge.

But this is exactly what i want...

Android studio, for example, which is also using Git is allowing for a valid PULL and then you have local conflicts to resolve. I don't see why SourceTree doesn't do that and i have to revert/stash changes...

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

649 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