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?
Edit:
The same happens when I use git mergetool
Best,
David
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.