Meta Data Services Programming
Merging Object Versions
The version management feature of the repository engine supports branching. A branch results when you create a new object version whose predecessor version already has one or more successor versions. Common branching scenarios are:
- When two concurrent development efforts must change the same object.
- When a maintenance change is required on an older version of an already released object.
In scenarios like these, it is sometimes necessary to merge branched lines of development back together. You can merge one object version into another with the MergeVersion method of the IRepositoryObjectVersion interface. You can merge several branches together by successively merging two branches at a time until all branches have been merged.
The following topics describe the merging process in more detail.
| Topic | Description |
|---|---|
| Merge Overview | Provides basic information about merge behavior |
| Invoking MergeVersion | Explains prerequisite steps for invoking the MergeVersion method |
| Resolving Merge Conflicts for Properties | Describes how conflicts between property values are resolved |
| Resolving Merge Conflicts for Collections | Describes how conflicts between collections are resolved |
| Examples of Merging Versions | Provides before and after examples of merged objects |