Resolving Merge Conflicts for Properties

Meta Data Services Programming

Meta Data Services Programming

Resolving Merge Conflicts for Properties

For each property, MergeVersion uses this rule to resolve merge conflicts:

  • If the primary version differs from the basis version, the repository engine uses the property value from the primary version.

  • If only the secondary version differs from the basis version, the repository engine uses the property value from the secondary version.

  • If neither version differs from the basis version, the repository engine leaves the property value in the current version unchanged.

See Also

IRepositoryObjectVersion::MergeVersion

Merging Object Versions

Resolving Merge Conflicts for Collections

Version Graph

Versioning Objects