I dont know what the common factor is on the files that it does happen with.ĮDIT: So it turns out the two files I was just trying to merge, the difference was that the file was no longer existent on the remote server. Im guessing it was when SourceTree automatically updated itself or something.īut anyway, none of the answers in this post have helped for me.Ĭlose prefs, select External Diff (or cmd-D) and observe DiffMerg launches. It used to work fine, and then suddenly stopped working a while back, without my having changed any configuration options whatsoever. Im an Android dev that doesnt much use Xcode, but this was exactly what I needed. ![]() ![]() Today, when I right click-resolve using external diff tool, I get a window for a second showing that the launch is happening, and then nothing and the conflict disappears as though resolved.Īs you said I found the command line tool was not properly configured.
0 Comments
Leave a Reply. |