Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
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

External Diff SemanticMergeTool not working....

I am currently reviewing SourceTree + SemanticMerge for our Enterprise development team (30+ developers), but when I invoke the External diff, it returns an error dialog box with the following message:

Item has already been added. Key in dictionary: 'home' key being added: 'HOME'

 

I am able to run the SemanticMerge as a standalone tool successfully.

Spec: Window 10, SourceTree 2.6.1, SemanticMerge 2.0.127, Git 2.18.0

 

here is my .gitconfig

[user]
name = Stephen Kong
email = zollen.kong@gmail.com
[core]
autocrlf = true
[difftool "sourcetree"]
cmd = 'C:/Users/zollen/AppData/Local/semanticmerge/semanticmergetool.exe' -s $LOCAL -d $REMOTE
prompt = false
[mergetool "sourcetree"]
cmd = 'C:/Users/zollen/AppData/Local/semanticmerge/semanticmergetool.exe' -s $REMOTE -d $LOCAL -b $BASE -r $MERGED
trustExitCode = true
prompt = false
keepBackup = false

1 answer

0 votes
Mike Corsaro Atlassian Team Jul 30, 2018

Hello! SemanticMerge isn't officially supported as a diff tool, but you can use it by configuring it under "Custom" in the "Options > Diff > External Diff Tool" menu. The configuration should look something like this:

SemanticMerge.PNG

It does not work. I have already tried

Mike Corsaro Atlassian Team Jul 30, 2018

Looking at your .gitconfig file, it appears that it's different than mine -- can you try manually editing it so that it looks like this?

[difftool "sourcetree"]    
cmd = 'C:/Users/zollen/AppData/Local/semanticmerge/semanticmergetool.exe' \"$LOCAL\" \"$REMOTE\"
[difftool "sourcetree"]    
cmd = 'C:/Users/zollen/AppData/Local/semanticmerge/semanticmergetool.exe' -s \"$LOCAL\" -d \"$REMOTE\"

OR

[difftool "sourcetree"]    
cmd = 'C:/Users/zollen/AppData/Local/semanticmerge/semanticmergetool.exe' -s $LOCAL -d $REMOTE

 

Both scenarios do not work..

Mike Corsaro Atlassian Team Jul 30, 2018

Where is the error dialog box coming from? Is Semantic Merge the one giving it? Can you post a screenshot? I'm unable to reproduce the issue on my machine on both the enterprise and non-enterprise versions 😕

You mean you are able to invoke Semantic Merge from SourceTree???

I am able to reproduce this issue with window 7 and window 10.

Let me see if I could reproduce the issue from my office. 

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Apps & Integrations

Send an Email or Publish to Confluence - What should you do with your release notes?

Background When you hear the words ‘Release notes’, almost always you think of an unsolicited email from a software vendor. But I am here to tell you that from our data, sending release notes via E...

88 views 0 1
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