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

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

  • Create New...