[Joe Ross]

We typically tried to avoid merging. We tried to work on different parts of the code, so that people wouldn't have to merge. There were times where someone delayed implementing a change until someone else had finished with that VI. When we failed to communicate and ended up needing to merge, we used the LabVIEW merge tool, which most of the time worked fine.

One thing we noticed is there are times when there were unexplained changes (someone didn't explicitly change a VI, but it changed anyway). We were able to minimize these by turning on the separate compiled code from VIs. We also made each global variable its own VI, because we found that changing anything in the global variable VI made LabVIEW recompile every VI that uses that global variable VI).