Merge Dialog Box

LabVIEW 8.5 Help
August 2007

NI Part Number:
371361D-01

»View Product Info

This dialog box appears if you merge two VIs.

Use this dialog box to interactively merge the changes of two VIs.

This dialog box includes the following components:

Unresolved conflicting change(s)—Displays all unresolved changes.
Choose Theirs—Merges the change in Their VI.
Choose Base—Merges the change in Base VI.
Choose Yours—Merges the change in Your VI.
Show all changes—If selected, LabVIEW displays all changes in the Unresolved conflicting change(s) list. If deselected, LabVIEW displays only conflicting changes in the Unresolved conflicting change(s) list.
Show Detail—Highlights the detail of the change you select on the front panel or block diagram. The Show Detail button is available only when you select a detail description in the Unresolved conflicting change(s) list.
Show Difference—Highlights the change you select. The Show Difference button is available only when you select a change in the Unresolved conflicting change(s) list.
Options—Launches the Merge Options dialog box.