Bane of Anubis

QUOTE (Aristos Queue @ Mar 25 2009, 02:37 PM) Thanks - sorry 'bout the confusion. I've scraped the surface somewhat on the Perforce LV comparison, but if the functionality to merge LLBs is only available >= 8.6, that'll help my current situation since we're running 8.5.

Does anybody know if one library w/ 2 revs can be merged? I'm sure this has probably been broached before, but can't find an appropriate thread. I'm curious to know if Perforce (or any RCS) can do this - e.g., user 1 checks out Files.llb to edit file1.vi & user 2 checks out Files.llb to edit file2.vi. As far as I can tell, when both users check the library file, Files.llb, back in, either user 1's version has to be accepted or user 2's - is there any library merge functionality (similar to the .vi LabVIEW Merge)? Thanks for any help or insight, Bane