Jump to content
K_Z

External 2 Way Merge Tool

Recommended Posts

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?

Share this post


Link to post
Share on other sites

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.

Share this post


Link to post
Share on other sites

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:

2way.PNG

 

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"

 

Share this post


Link to post
Share on other sites

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 account

Sign in

Already have an account? Sign in here.

Sign In Now

×