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:
- I applied the stash, which reported errors due to a merge conflict.
- I went back to my working copy's file status
- It shows the conflicted file once in "staged files" and once in "unstaged files", both with an exclamation mark indicating conflicts.
- The version in "staged files" shows no changes
- I right-clicked on either of these versions and chose resolve conflicts/launch external merge tool
- My diff tool launched, but did not find these files "<whatever>_LOCAL_21148.tex" "<whatever>_BASE_21148.tex" etc.
- But it creates new files named .merge_file_<some_hex_number> which as far as I can see contain the base, local, and remote versions.
Can someone point me to what's going wrong here?
Edit:
The same happens when I use git mergetool
Best,
David