Sourcetree does not start. Besides comparing an external merge tool

Question

Suddenly, when I try to run the "External Merge Tool" from Sourcetree, the tool does not appear. I speak suddenly because it worked the last time I tried. The dialogue remains forever:

In the end, I found that this process is related to visual merging (dunno, how to copy the command line from the Windows task manager):

This process, by the way, does not disappear when I press the interrupt, so someone probably did not do their homework. In fact, I would not notice this if there were six processes on this command line.

These are my settings:

How to fix it? I need to combine the project, and I do not know what to do ...

Answer 1

, , , , . git , sourcetree . git .

- git, , my/use yours.

Answer 2

Sourcetree, :

sudo xcode-select -s /Applications/Xcode.app/Contents/Developer

Answer 3

, Windows, , git-mergetool , ( ) .

CONFLICTED_FILE_PATH, , git-mergetool:

sh "c:\Program Files\Git\mingw64\libexec\git-core\git-mergetool" -y --tool=sourcetree -- CONFLICTED_FILE_PATH

Answer 4

The problem in my case was that I chose the tool itself, and not the path to it. This seems to be a must:

You can also see this in your .gitconfig file (located in the user directory):

Before

[difftool "sourcetree"]
    cmd = '' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
    cmd = '' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"

After

[difftool "sourcetree"]
    cmd = 'C:/Program Files/P4Merge/p4merge.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
    cmd = 'C:/Program Files/P4Merge/p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"

Answer 5

The problem for me was that I still had the Merge tool specified as System Default. Changing this configuration also to DiffMerge seems to have solved it: