So I have the external merging tool setup, with the path and everything, but when I click "Launch External Merge Tool" from the dropdown, the merge tool is never launches
This is what my .gitconfig looks like
[..]
[difftool "sourcetree"]
cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' -merge -result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustExitCode = true
And my Tools/Diff window in sourcetree:Can anybody give me a hand? Thanks!
Hi @Gizambica ,
Welcome to the Community!
I'm not 100% familiar with DiffMerge itself, but looking at their command line argument documentation: https://sourcegear.com/diffmerge/webhelp/sec__clargs__merge.html
It looks as though the arguments you are supplying might be attempting to perform the merge automatically and then exiting. Have you tried setting the merge command without supplying any arguments to see if it will launch?
I hope that helps!
-Jimmy
Apparently the issue was the file itself! It was either deleted or renamed in one of the branches, and thats why the merge wouldnt be possible!
I have the terrible habit of renaming files left and right, guess I brought that on myself!
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
I'm glad you were able to get to the root of the problem!
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.