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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

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,457,001
Community Members
 
Community Events
176
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

Atlassian Community Events