K_Z 0 Posted March 7, 2017 Report Share Posted March 7, 2017 Here is the snip from my .gitconfig [diff] tool = semanticmerge #tool = vscode [difftool] prompt = false [difftool "semanticmerge"] cmd = \"C:\\Users\\KyleZeronik\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$LOCAL\" -d \"$REMOTE\" [difftool "vscode"] cmd = code --wait --diff $LOCAL $REMOTE [merge] tool = semanticmerge [mergetool] prompt = false keepBackup = false [mergetool "semanticmerge"] cmd = \"C:\\Users\\KyleZeronik\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$LOCAL\" -d \"$REMOTE\" -b \"$BASE\" -r \"$MERGED\" trustExitCode = true Here is my semanticmergetool.conf --defaultencoding=NONE --resultencoding=NONE --externaldifftool="C:\Users\KyleZeronik\AppData\Local\semanticmerge\mergetool" -s="#sourcefile" -sn="#sourcesymbolic" -d="#destinationfile" -dn="#destinationsymbolic" -t="#filetype" -i="#comparationmethod" -e="#fileencoding" --textonly --externalmergetool="C:\Users\KyleZeronik\AppData\Local\semanticmerge\mergetool" -b="#basefile" -bn="#basesymbolic" -s="#sourcefile" -sn="#sourcesymbolic" -d="#destinationfile" -dn="#destinationsymbolic" -t="#filetype" -i="#comparationmethod" -e="#fileencoding" --textonly -r="#output" -re="#resultencoding" --external2waymergetool="C:\Program Files\Devart\Code Compare\CodeMerge.exe" -TWOWAY -MF "#sourcefile" -TF "#destinationfile" -RF "#output" --tabspaces=4 I can successfully invoke Code Merge from a command line with the arguments listed but nothing happens when I try to invoke 2 merge from SemanticMerge UI Any thoughts? Link to post Share on other sites
manu 165 Posted March 14, 2017 Report Share Posted March 14, 2017 Hi! I think you are not doing anything wrong. We found an issue based in your feedback and it seems the 2-way merge tool is not launched when needed. We'll take care of it and I'll upgrade this thread. Link to post Share on other sites
K_Z 0 Posted October 3, 2017 Author Report Share Posted October 3, 2017 Any update on this item Thanks in advance Link to post Share on other sites
manu 165 Posted October 4, 2017 Report Share Posted October 4, 2017 Hi @K_Z, I have just tested 2.0.107.0 and the "Csharp\4. AclInfoPrinter" example and works well. It has a 2-way-merge resolution available, please give it a try: This is my "C:\Users\MyUser\AppData\Local\semanticmerge\semanticmergetool.conf" config : --external2waymergetool="C:\Program Files\Devart\Code Compare\CodeMerge.exe" /TWOWAY /THEIRSFILE "#sourcefile" /THEIRSTITLE "#sourcesymbolic" /MINEFILE "#destinationfile" /MINETITLE "#destinationsymbolic" /RESULTFILE "#output" Link to post Share on other sites
Recommended Posts
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!
Register a new accountSign in
Already have an account? Sign in here.
Sign In Now