Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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
Posted in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

3,202 views 19 18
Join discussion

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