You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
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
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.