C and LabView version control with Git

[sparrowkc]

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.