Select Tools»Merge»Merge LLBs to display this dialog box.

Use this dialog box to automatically merge the changes between two LLBs.

This dialog box includes the following components:

Option Description
LLBs to Merge Specifies the original LLB and the two revisions of the original LLB you want to merge.
  • Base LLB—

    Specifies the filename and location of the original LLB.

  • Their LLB—

    Specifies the filename and location of the first LLB you want to merge.

  • Your LLB—

    Specifies the filename and location of the second LLB you want to merge.
Merge options Provides options for the merge operation.
  • Auto-resolve—

    Merges any non-conflicting changes between the LLBs automatically. This checkbox contains a checkmark by default.

  • Front panel position/size changes—

    Merges changes between the position and size of objects on the front panel. This checkbox contains a checkmark by default.

  • Block diagram cosmetic changes—

    Merges changes on the block diagrams that do not affect the execution of the LLB, such as color changes, visible subdiagrams in Case and Stacked Sequence structures, and format and precision of constants.

    • Block diagram position/size changes—

      Merges changes between the position and size of objects on the block diagram. This checkbox does not contain a checkmark by default.
Merge

Performs the merge operation.

If you want to merge the changes between two VIs, use the Select VIs to Merge dialog box instead.