LV Merge and Diff Wrapper

  1. Jonathan Lindsey
  2. LV Merge and Diff Wrapper

Wiki

Clone wiki

LV Merge and Diff Wrapper / Home

View History

Configure SourceTree to use LV Merge and Diff Wrapper

  1. In SourceTree go to Tools -> Options -> Diff.
  2. Change the External Diff and Merge Tools from 'System Default' to 'Custom'.
  3. Change the External Diff and Merge Commands and Arguments to the values below.
  4. Click OK

Note: on 32-bit computers you must remove the "[space](x86)" from the below paths.

Diff Command: C:\Program Files (x86)\LV Merge and Diff Wrapper\LV Diff Wrapper.exe

Diff Arguments: \"$LOCAL\" \"$BASE\" -nobdcosm -nobdpos


Merge Command: C:\Program Files (x86)\LV Merge and Diff Wrapper\LV Merge Wrapper.exe

Merge Arguments: \"$BASE\" \"$REMOTE\" \"$LOCAL\" \"$MERGED\"

Tools -> Options

  1. General -> Spell check commit messages On
  2. Git -> Do not fast-forward when merging, always create commit On
  1. Configure LabVIEW to work nicely with Source Control by doing the following.
    1. Open LabVIEW
    2. Go to Tools -> Options -> Environment -> General
    3. Check the "Separate compiled code from new files" checkbox.
    4. Click OK

Updated