You are here: NI Home > Support > Product Reference > Manuals > LabVIEW 8.5 Help

Use the Merge VIs dialog box to automatically or interactively resolve differences between an original VI and two revisions of the original VI. Given the original VI and two revisions based on the original VI, LabVIEW can resolve and merge changes into a separate merged VI. If differences between the two VIs conflict, you can interactively resolve the changes using the Merge dialog box.

Tip  You also can configure a third-party source control provider to use LVMerge.exe as the default merge application. LVMerge.exe is equivalent to the Merge VIs dialog box.

Complete the following steps to automatically or interactively merge two VIs.

1. Because LabVIEW cannot load two VIs with the same name, you must rename the VIs you want to merge.
2. Select Tools»Merge VIs to display the Merge VIs dialog box.
3. Click the Browse button next to the Base VI text box and navigate to the original VI.
4. Click the Browse button next to the Their VI text box and navigate to the first VI you want to merge.
5. Click the Browse button next to the Your VI text box and navigate to the second VI you want to merge.
6. (Optional) Select from the options in the Merge options section to determine how LabVIEW merges the VIs.
7. Click the Merge button. The Merge front panels and Merge block diagram windows. An untitled merged VI, and the Merge dialog box appear.
8. By default, LabVIEW collapses each change in the Unresolved conflicting change(s) field. Click the expand/contract symbol next to each change to view the details of that change.
9. For each change, select the detail of either Your VI or Their VI by clicking the description of the change under the Yours or Theirs subcategories. LabVIEW puts an X next to each unresolved change.

   Note  Most changes are circled in red on either the Front panel changes window, the Block diagram changes window, or in the untitled merged VI.

10. Click the Choose Theirs, Choose Yours, or Choose Base button to select the change you want to accept and to merge it with the untitled merged VI. As you resolve each change, a checkmark appears next to the change.
11. After you resolve all changes, click the Close button to close the Merge dialog box.
12. Save the untitled merged VI.