LabVIEW Merge: Auto-resolve

Do you know that you can automatically merge two VIs developed between two different members as long as there is very no conflict in the same structure? For example, if you have modified one of the states and the other developer modified totally different state, then when you merge with Auto-resolve checkbox enabled, LabVIEW will try to merge both of your changes into a single VI. Auto-Resolve checkbox in Merge Options Options Here in this merge, you can find LabVIEW has resolved between mine (Yours) and other developer work (Theirs).
Read More

Merging LabVIEW VIs with SourceTree

Blogs, LabVIEW Blog
After 10+ years of working in LabVIEW, I finally got to merge one of the projects properly. Though we can use source control like SVN & Git with LabVIEW file types (such as .vi, .ctl), there is very little chance our LabVIEW developers get to diff and merge the LabVIEW file types. This is mainly due to the visual complexity that we go through, the binary format of LV files and real estate needs, and the simplicity of silos in most LabVIEW projects. Of them, LabVIEW merge is very less used than LabVIEW diff. I had some directions on how to apply it for sourcetree from Endigit here but later found that it partly worked. So I customized it further in order to get it working. Here is the working…
Read More