9

Ive been using tortoiseMerge as external tool in source tree for a while now but today I had 3 conflicts after pull, so I fixed the first one then I wanna open the next and window pops up saying Visual merge in progress, but nothing happens, tortoise is not launching.

How could that happen?
It works one second and than it doesn't...

I did some search but did not really find much, I tried to change diff tool in source tree from system default to tortoise, but that did nothing.

Any ideas what happened?

CodeWizard
  • 128,036
  • 21
  • 144
  • 167
Honza
  • 323
  • 3
  • 14

3 Answers3

1

This may happen due to Sourcetree couldn't fine '.gitconfig' file location. Even if you keep 'Allow Sourcetree to modify your global Git config files' check box ticked. The may not be updated.

Try adding, HOME in your system environment variables to the path of your '.gitconfig' file location. For e.g. HOME C:\Users\XXX

This worked for me after trying all above solutions

Pritam Patil
  • 89
  • 3
0

This can happen if one of the files is deleted.

You can run the following command in a command prompt in windows, to be able to answer the question git-mergetool asks when one of the files (or even both) is deleted.

Use your own CONFLICTED_FILE_PATH, and you may need to use a different path to point to your git-mergetool:

sh "c:\Program Files\Git\mingw64\libexec\git-core\git-mergetool" -y --tool=sourcetree -- CONFLICTED_FILE_PATH
Paiman Roointan
  • 514
  • 5
  • 17
-1

Did you select the diff/merge tool and added the path, too? Screenshot of souretree External Diff/Merge setting

You may also check the '.gitconfig' file (located in the user directory).

Lonzak
  • 9,334
  • 5
  • 57
  • 88