Source Code Control with LabVIEW (LVMerge and LVDiff info as well)

[Mark.K]

A question came up during a recent user group meeting where Tom McCray presented an introduction to source code control. I wanted to summarize more resources here.

The question related to whether or not you can use merge and diff functions with LV in source code control tools.

Yes, lvmerge and lvdiff can be used with Git or other source control systems.

There is a community forum for this topic here:

https://forums.ni.com/t5/Git-User-Group/gp-p/grp-2368

And our friends over at Delacor (an NI alliance partner with CLA-level experience) have good resources on this topic:

http://delacor.com/configuring-hg-or-git-to-use-labview-compare-and-labview-merge/

I’d suggest starting with the Delacor material, then asking questions in the Git user group.

Also, one user made a script to set up git for LabVIEW diff and merge a few years back: 

https://github.com/joerg/LabViewGitEnv

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Here is a larger list of additional resources:

• Configuring Hg or Git to use LabVIEW Compare and LabVIEW Merge | Delacor http://delacor.com/configuring-hg-or-git-to-use-labview-compare-and-labview-merge/
• Git User Group - Discussion Forums - National Instruments https://forums.ni.com/t5/Git-User-Group/gp-p/grp-2368
  GitHub - joerg/LabViewGitEnv: Everything you need to hold your LabView projects version controlled with GIT. https://github.com/joerg/LabViewGitEnv
• Managing LabVIEW VI and Application Revision History - National Instruments http://www.ni.com/tutorial/9924/en/
  Configuring Source Control with LVMerge.exe - LabVIEW 2017 Help - National Instruments http://zone.ni.com/reference/en-XX/help/371361P-01/lvhowto/configmerge_thirdparty/
• Source Code Control: Using TortoiseSVN (Subversion) with LabVIEW for Diff and Merge Operations - Discussion Forums - National Instruments https://forums.ni.com/t5/Example-Program-Drafts/Source-Code-Control-Using-TortoiseSVN-Subversion-wit...
• Slides: Intro to Source Code Control and Distributed Version Control Systems - National Instruments https://learn.ni.com/labview-center-of-excellence/resources/448/slides-intro-to-source-code-control-...