How VersionVault merges
To merge versions, HCL VersionVault takes the following steps:
- It identifies the base contributor.
- Next, it compares each contributor against the base contributor.
- For any line that is unchanged between the base contributor and any other contributor, HCL VersionVault copies the line to the merge output file.
- For any line that has changed between the base contributor and another contributor, HCL VersionVault performs a trivial merge by accepting the change in the contributor. Note, however, that depending on how you started the merge operation, HCL VersionVault may copy the change to the merge output file. However, you can disable the automated merge capability for any given merge operation. If you disable this capability, you must approve each change to the merge output file.
- For any line that has changed between the base contributor and more than one other contributor, HCL VersionVault requires that you resolve the conflicting difference.