Skip to content

Latest commit

 

History

History
28 lines (21 loc) · 1.21 KB

LabVIEWGitCompSetup.md

File metadata and controls

28 lines (21 loc) · 1.21 KB

Setup your git for LabVIEW development

  • Install git

  • Clone, compile and install VICompare tool

    • This tool is better at dealing with paths than the one that ships with LabVIEW

  • Open your global .gitconfg (or not see note)

    • May need to be created best way to do this is setup your Name and email
    • git config --global git config --global user.email "[email protected]"
    • git config --global user.name "User Name"
    • In windows located at C:\Users[UserName].gitconfig

  • Paste in the following block which tells git that you want to use these tools as merge and diff tools.

[mergetool "LVMerge"]
	cmd = 'C:/viscc/vimerge.exe' \"$BASE\" \"$REMOTE\" \"$LOCAL\" \"$MERGED\"
[difftool "LVDiff"]
	cmd = 'C:/viscc/vidiff.exe' \"$LOCAL\" \"$REMOTE\"
[merge]
	tool = LVMerge
[diff]
    tool = LVDiff

NOTE:: if you do development in git using more than one language you may want to set the merge and diff tools in a .gitconfig in the repository root. This way that setting applies to only that repo and you can use the text merge and diff tools for other languages.