I installed latest versions of SourceTree (1.9.6.1) and TortoiseGit (2.2.0.0). Now when trying to resolve merge conflict using external tool, small window flashes quickly and TortoiseGitMerge window doesn't open. If I run SourceTree as administrator - everything works as expected (SourceTree settings and .gitconfig are identical in both cases). Is it possible to have it working for non-administrator account?
Update: I reinstalled old versions of TortoiseGit and SourceTree, and nothing changed, I still can launch TortoiseMerge as external merge tool only when I run SourceTree as administrator.
@Seth I reinstalled my previous version of TortoiseGit - 1.8.15.0-64bit, didn't help. Then I reinstalled my old version of SourceTree - 1.6.18, didn't help either. So looks like issue isn't related to versions. Then I tried to run SourceTree as administrator - still works just like before.
The question still holds - how to be able to merge without running SourceTree as administrator.
At the surface, it sounds like a problem with TortoiseGitMerge rather than SourceTree.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.