Re: C and LabView version control with Git
 

There is a 3rd party diff implementation called LVDiff which uses the existing VIs provided with the Development system to perform a diff. It has a bit of overhead, all you really need is to run a supplied VI with the two files and LabView will launch the diff tool (I have a .vi that can do this correctly parsing the command line arguments, I'll attach it when I get the chance). In the "2009" edition of the documentation (but not 8.6) there is a pre-provided LVCompare.exe file that does the same thing, compiled into a binary. LVMerge.exe is the official merge tool and is provided with our 8.6 version, but it doesn't seem to be writing over the correct file, instead returning a successful result, but not writing it out, thus taking one file as the merged result entirely ignoring the other... the only explanation I can come up with is a software bug.

I have played around with TortoiseGit (forked from TortoiseSVN), you can get two changes in two separate files to merge into one? I can get as far as calling LVMerge with the (as I understand) correct arguments (or using the merge under Tools->Source Control iirc).

Re: C and LabView version control with Git
 

Yes, after following the instructions in my previous post, merging seems to work.

For a test, I created a simple VI that uses a loop with a shift register to increment a number. I immediately created a new branch and switched to it. In that branch, I replaced the shift register with a feedback node. I committed and checked out the master branch. In the master branch, I added a time delay to make the counter run slower. I committed master. I then did a merge from the second branch into master and it worked just like in the tutorial. The resulting file has a feedback node and a time delay.

I've also tried making conflicting changes to the robot code. It made me choose which version of the conflict I wanted to keep, and honored my choice.

I really like this.