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
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:
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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\"
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
[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..
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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 must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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.
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.