Jump to content

Configure with Git

Recommended Posts

Looking for some clarification

I have the following for my difftool config which aligns with the docs

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

Later in the dock it shows the following for the mergetool config

[mergetool "semanticmerge"]
  cmd = C:/Users/pablo/AppData/Local/semanticmerge/semanticmergetool.exe -s \"$REMOTE\" -d \"$LOCAL\" -b \"$BASE\" -r \"$MERGED\"

Why the flip of the -s and -d params from difftool to mergetool?

I think of a merge as taking my (your) source into their destination - should I simple set up the parameters to adhere to that semantic - although I think Semantic Merge has a mis alignment of Src - their changes and Dst - your changes

Please clear up my confusion with the config and the semantics :)

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.

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.


  • Create New...