You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
I originally setup SourceTree to use TortoiseGitMerge as my merge tool of choice. I finally ran into a situation where I needed to do a merge and TortoiseGitMerge would throw an error about not being able load the files. To try and solve this issue I decided to try hard coding some paths to see if I could TortoiseGitMerge to run properly. That didn't work so I moved on and tried a few more things. Eventually I gave up and decided to try using BeyondCompare instead. Except, no matter what I do SourceTree keeps launching TortoiseGitMerge. The only way I can get it to not launch TortoiseGitMerge is to change it to System Default in which case SourceTree just hangs.
I've deleted my settings, restarted my computer, deleted my settings about 400 times again, reinstalled SourceTree, deleted everything I can find related to SourceTree then reinstalled. And still no matter what I do SourceTree keeps launching TortoiseGitMerge. The only change in behavior I've found is if I uninstall TortoiseGit SourceTree hangs because it can't find the executable.
I've followed the steps mentioned here and that hasn't helped. Why is SourceTree still trying to run TortoiseGitMerge even after I've deleted all the settings files I can find?