You can reconcile different sets of changes to the same LLB with the merge LLBs functionality in LabVIEW.

Note Merging LLBs requires LabVIEW Professional edition.

LabVIEW uses a three-way merge to merge LLBs. A three-way merge reconciles two diverging sets of changes by comparing each set to the same original code. The LLB merge capability in LabVIEW uses the following terms:

  • Base LLB—The most recent common ancestor of the VIs that you want to merge. This LLB is usually a version of the LLB under source control.
  • Your LLB—The local working copy of the LLB that you are developing. Includes the changes that you want to introduce.
  • Their LLB—The incoming changes to the common ancestor that you need to reconcile with your own changes.

    For example, another user might have made changes to the same LLB and checked these changes into source control before you submitted your own changes. In this case, you need to reconcile your own changes with the changes the other user made to the same starting point LLB.

    • Use the Select LLBs to Merge dialog box to automatically or interactively resolve differences between an LLB and two revisions of that original LLB. If differences between the two LLBs conflict, you can interactively resolve the changes using the Merge LLBs dialog box.

    To automatically or interactively merge two LLBs, complete the following steps.

    1. Select Tools » Merge » Merge LLBs.
      The Select LLBs to Merge dialog box appears.
    2. Click Browse next to Base LLB, navigate to the original LLB, and click OK.
    3. Click the Browse next to Your LLB, navigate to the LLB with your own changes, and click OK.
    4. Click Browse next to Their LLB, navigate to the LLB with the other user's changes, and click OK.
    5. Optional: Select options from the Merge options section to configure how LabVIEW merges elements of the LLBs.
    6. Click the Merge button.
      Note If both Your LLB and Their LLB have changes to the same project library file .lvlib, LabVIEW cannot resolve the changes automatically. Resolve these changes by opening one revision of the .lvlib file and manually editing it to match the other revision.
      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 Theirs, Yours, and Merged specify the type of changes, if any, in each LLB.
    7. To select which change to apply to the merged LLB, select a row of changes and click Choose Theirs, Choose Base, or Choose Yours.
      As you resolve each change, a checkmark appears next to the change you selected.
    8. If any two LLBs contain different revisions of the same VI, click the row containing the VI and click Merge VIs.
      The Select VIs to Merge dialog box appears.
    9. Resolve the differences between the revisions to the VI.
      Tip If you merge files, you can see the file you created by highlighting the row and clicking View Merged File.
    10. After you resolve all changes:
      1. Click the Close button to close the Merge LLBs dialog box.
      2. 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.