I installed latest versions of SourceTree (22.214.171.124) and TortoiseGit (126.96.36.199). 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 - 188.8.131.52-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.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG