Table Of Contents

Merging Files and Resolving Conflicts

Last Modified: April 10, 2020

Manually editing and merging files helps you maintain stable source code when merge conflicts occur.

Recommendation Details
Merge project (.lvproject) files manually.

Merge project files manually rather than using the auto-merge utility in your source code control system.

One expected merge conflict in the project file is the checksum, which records the state of the file when it was last loaded. When manually merging the project file, you can select the checksum from either version. LabVIEW NXG always reloads the project and generates a new checksum.

Manually edit a VI to resolve conflicts between two versions.

Avoid performing merge operations on VIs.

If you identify a conflict between two versions of a VI, view the two versions in NI Compare to locate differences, then edit the code to satisfy the requirements of a project.

Recently Viewed Topics