[Terry Sherman]

We know that the professional edition of LabVIEW has diff and merge capabilities, it seems that those capabilities are not present in the FRC edition of LabVIEW. What techniques for revision control, code management, etc are teams doing?

For example, we break up our design into modules and each module has an owner. This works great for the most part but when we need to modify shared code such as telop.vi or robot globals, etc, it gets harder to keep the changes straight. Using tools such as SVN have lost much of their value since we cannot diff or merge.

Thoughts? Suggestions?