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

Use this dialog box to merge the changes of two VIs. If you want to merge the changes of two LLBs, use the Select LLBs to Merge instead.

This dialog box includes the following components:

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

    Specifies the filename and location of the original VI.

  • Their VI—

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

  • Your VI—

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

    Automatically merges any non-conflicting changes between the VIs. 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 VI, such as color changes, visible subdiagrams in Case and Stacked Sequence structures, and format and precision of constants. This checkbox contains a checkmark by default.

    • 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.