Use the Select LLBs to Merge dialog box to automatically or interactively resolve differences between an LLB and two revisions of that original LLB. Given the LLB and two revisions based on the original LLB, LabVIEW can resolve and merge changes into a separate merged LLB automatically. If differences between the two LLBs conflict, you can interactively resolve the changes using the Merge LLBs dialog box.
Note The Merge LLBs dialog box is available only with the LabVIEW Professional Development System.
Complete the following steps to automatically or interactively merge two LLBs.
Select Tools»Merge»Merge LLBs to display the Select LLBs to Merge dialog box.
Click the Browse button next to the Base LLB text box, navigate to the original LLB, and click OK.
Click the Browse button next to the Their LLB text box, navigate to the first LLB you want to merge with the Base LLB, and click OK.
Click the Browse button next to the Your LLB text box, navigate to the second LLB you want to merge with the Base LLB, and click OK.
(Optional) Select options from the Merge options section to configure how LabVIEW merges elements of the LLBs.
Click the Merge button. The Merge LLBs dialog box appears. LabVIEW lists all the files found in each LLB in the File(s) column. The symbols next to each file under the Theirs, Yours, and Merged columns specify the type of changes, if any, that LabVIEW found in each LLB.
Note If both Your LLB and Their LLB have changes to the same project library file (.lvlib), LabVIEW cannot resolve the changes automatically. The recommended way of resolving the changes is to open one revision of the .lvlib file and manually edit it to match the other revision.
Select a row of changes and click the Choose Theirs, Choose Base, or Choose Yours button to select the change you want to accept and add to the merged LLB. As you resolve each change, a checkmark appears next to the change you selected.
If any two LLBs contain different revisions of the same VI, use the Merge VIs button to merge the revisions. Click the row containing the VI and click the Merge VIs button to open the Select VIs to Merge dialog box.
If you merge files, you can highlight the row containing the file and click View Merged File to see the file you created.
After you resolve all changes, click the Close button to close the Merge LLBs dialog box and click the Save button to save the merged LLB.
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 Select LLBs to Merge dialog box.
To merge individual VIs, you can use the Select VIs to Merge dialog box to automatically or interactively resolve differences between different versions of a VI.
