I agree with Crossrulz -- use a Version Control System, Tortoise SVN is pretty good (though you need access to a Subversion server), and Project merging "mostly" works. I must say that working with a team of one (BS at work and BS at home), SVN is a wonderful way to keep synchronized (as long as I remember the rule "Commit before leaving and Update when starting"), but now that I'm doing some "small team" (2-3) work, we do occasionally "stomp on" each other's files (usually because someone "forgets" to Update First, Commit Last.
There are two types of Collisions that can arise -- LabVIEW VIs and Controls, and LabVIEW Projects. The VIs and Controls you can figure out using the LabVIEW "Compare" utility -- rename "My Bad.vi.r001" and "My Bad.vi.r002" to "My Bad.vi.r001.vi" and "My Bad.vi.r002.vi" (just add ".vi" to the end). Now Compare will work. Figure out which you want, delete the others, and rename the "good" one by deleting the final ".rxxx.vi" extensions.
If the Project is corrupted, and you've been clever enough (or, perhaps, foolish enough) to (a) have your Project all contained within a single top-level file folder (with sub-folders underneath, perhaps), then I usually just delete the Project file(s) and recreate it, doing an "Add Folder (snapshot)" to "get everything" and discard what I don't want (like .aliases and possibly Documentation).
Bob Schor
