I am trying to unstash some files, one of the files causes merge conflicts, which I am trying to resolve using my external merge tool Beyond Compare. I have never had to resolve merge conflicts due to unstashing using SourceTree, so I might be doing something wrong.
Here's what I did:
Can someone point me to what's going wrong here?
The same happens when I use git mergetool
This year will be my first time attending Atlassian Summit, yay! So I wanted to use this Friday Fun topic to find out more from all of you. Are you attending? Is there anything specific you are look...
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