This dialog box includes the following components:
File(s)—Displays the name of a file that changed between the LLB and the two revisions of the original LLB.
Theirs—Displays whether a file under File(s) has been altered within Their LLB.
Yours—Displays whether a file under File(s) has been altered within Your LLB.
Merged—Displays whether changes to a file under File(s) has been included in the merged LLB.
Choose Theirs—Selects the change in the LLB you selected as Their LLB and includes the change in the merged LLB.
Choose Base—Selects the change in the LLB you selected as Base LLB and includes the change in the merged LLB.
Choose Yours—Selects the change in the LLB you selected as Your LLB and includes the change in the merged LLB.
Merge VIs—Opens the Merge VIs dialog box so that you can resolve the differences between multiple revisions of the highlighted VI.
View Merged File—Opens the revision of the file you created in the merged LLB. If you view a merged VI that contains a subVI with unresolved conflicts, LabVIEW launches the Yours revision of the subVI. Save any edits you make to the subVI by selecting Choose Yours or Merge VIs. LabVIEW saves any edits you make to the subVI to Your VI.