Configure with Git

[Kara 0]

Hi there,

 

how can I configure SemanticMerge with Git?

 

thanks

[manu 165]

Hi Kara,  it's easy! Check the following link: http://rlbisbe.wordpress.com/2013/04/15/semantic-merge-as-the-default-merge-tool-with-git-on-windows/

[K_Z 0]

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

[manu 165]

Yes, there's a lot of confusion regarding the -s and -d parameters but it's as it's written. Check this for further info, is basically the same question you had: https://github.com/gitextensions/gitextensions/issues/727