Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,297,398
Community Members
 
Community Events
165
Community Groups

DiffMerge never launches

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:image.pngCan anybody give me a hand? Thanks!

1 answer

1 accepted

1 vote
Answer accepted
Jimmy Seddon Community Leader Aug 29, 2019

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!

Like Jimmy Seddon likes this
Jimmy Seddon Community Leader Aug 29, 2019

I'm glad you were able to get to the root of the problem!

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Bug Fix: Sourcetree for Windows authentication error when updating to app password

Hello Sourcetree users!!! With the recent removal of Bitbucket Cloud account passwords for app passwords (please see our Bitbucket Cloud community post for details on why we made this change for se...

61,655 views 127 27
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you