Jump to content

K_Z

Members
  • Content Count

    7
  • Joined

  • Last visited

Community Reputation

0 Neutral

About K_Z

  • Rank
    Newbie
  1. I'm trying to confirm that the following is the correct config for utilizing VS Code as the external 2 way merge tool [mergetool "semanticmerge"] cmd = \"C:\\Users\\KyleZeronik\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$REMOTE\" -d \"$LOCAL\" -b \"$BASE\" -r \"$MERGED\" -a --nolangwarn -e2mt = \"code '"#"sourcefile' '"#"destinationfile' --L1 "#"sourcesymbolic --L2 "#"destinationsymbolic -o '"#"output' \" trustExitCode = true also I have working both "semanticmerge" and "vscode" as difftool(s) (I switch between the 2) [difftool] prompt = false [difftool "semanticmerge"] cmd = \"C:\\Users\\KyleZeronik\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$LOCAL\" -d \"$REMOTE\" --nolangwarn [difftool "vscode"] cmd = code --wait --diff $LOCAL $REMOTE
  2. Thanks for the response - does this apply if the only product we are using is Semantic Merge We don't have a Plastic server and I don't have a local cm command Thanks in advance
  3. How can we reset a license to be consumed by another user and/or machine?
  4. 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
  5. Any update on this item Thanks in advance
  6. 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?
×
×
  • Create New...