View Single Post
  #5   Spotlight this post!  
Unread 20-01-2016, 17:13
cjl2625's Avatar
cjl2625 cjl2625 is offline
apel py
AKA: Cory Lynch
FRC #2067 (Apple Pi)
Team Role: Programmer
 
Join Date: Jan 2013
Rookie Year: 2013
Location: Guilford, CT
Posts: 412
cjl2625 is a splendid one to beholdcjl2625 is a splendid one to beholdcjl2625 is a splendid one to beholdcjl2625 is a splendid one to beholdcjl2625 is a splendid one to beholdcjl2625 is a splendid one to beholdcjl2625 is a splendid one to beholdcjl2625 is a splendid one to behold
Re: Labview & Github

My team is using TortoiseGit + GitHub with LabVIEW. The main thing for LabVIEW is to set up the diff and merge tools which actually work pretty well. Here's how:
In the settings menu, there's an area for diff view and merge tool. Set an external diff tool like this:

The location for diff tool should be:
C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe

Do the same for merge tool, and the location for that is:
C:\Program Files (x86)\National Instruments\Shared\LabVIEW Merge\LVMerge.exe
__________________
Head Programmer / Driver
Reply With Quote