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

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Loading...

×
×
  • Create New...