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 188.8.131.52 for Windows
Diff tool and Merge tool configured: P4Merge
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
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
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs