You can configure a third-party source control provider to use LVMerge.exe as the default merge application. LVMerge.exe is equivalent to the Merge VIs dialog box. Use LVMerge.exe to automatically or interactively resolve differences between an original VI and two revisions of the original VI.
Complete the following steps to configure a third-party source control provider to use LVMerge.exe as the default merge application.
- Make sure the computer on which you are running LabVIEW also includes a third-party source control provider, which you should install and configure to meet the requirements of the current software project. Consult your source control administrator for additional assistance.
- Direct the source control provider to LVMerge.exe. LabVIEW installs LVMerge.exe in different locations depending on the platform. The following directories are default installation locations for LVMerge.exe, but may vary depending on the configuration of the local machine.
- (Windows) C:\Program Files\National Instruments\Shared\LabVIEW Merge\LVMerge.exe
- (Mac OS) /Library/Application Support/National Instruments/LabVIEW Merge/LVMerge.app/Contents/MacOS/LVMerge
- (Linux) /usr/local/bin/LVMerge
- (Optional) Configure any arguments that LVMerge.exe needs in the third-party source control provider. The following table lists available arguments.
| 1 (optional) |
Specifies path to the version of LabVIEW to use for the merge operation. If you do not supply this argument, the Merge VIs dialog box uses the following versions of LabVIEW by default:
- (Windows) Currently registered LabVIEW
- (Mac OS) Latest installed version of LabVIEW
- (Linux) Last installed LabVIEW
|
| 2 |
Path to a copy of the VI from where you checked it out (Base VI). |
| 3 |
Path to a copy the latest revision of the VI in source control (Theirs VI). |
| 4 |
Path to the VI you edited (Yours VI). |
| 5 |
Path to which to save the merged VI. |
- (Optional) Complete any remaining steps to configure the third-party source control provider. Consult the documentation for your third-party source control provider for more information.