User Guide - MKS

Key Resolution
CP Concepts
Working With a Resolution CP
The process for creating a resolution change package is as follows:
You create a normal change package and, during a Resync CP
operation, you ask Source Integrity to use it as a resolution change
package for recording all conflicts.
Source Integrity takes the specified change package and adds a
resolution list, thereby making it into a resolution change package.
Once all the merge conflicts are addressed, you can check in the
changes to the newly created resolution change package.
After all the changes are checked in, you can then close the resolution
change package, just as you would do for a normal change package.
Apply the change package.
Are There Any Limitations When Using a Resolution CP?
To avoid the problem of overlaps and conflicts during the Apply CP
operation, you can only apply one resolution change package per
operation.
The next three sections describe how to work with a resolution change
package. The topics covered are:
key concepts (see “Key Resolution CP Concepts” on page 399)
an example (see “How Resolution CPs Work” on page 400)
procedures for the graphical user interface (“To create a resolution
change package in the graphical user interface” on page 402)
The following lists the key concepts associated with resolution change
packages:
A resolution change package records all the required changes needed
to address the conflicts (or required merging) found when the Apply
CP command fails.
A resolution change package works by stating that entries in the
resolution change package supersede corresponding entries found in
change packages on the resolution list. Thus, if you perform a merge
from a branch and check the result into a resolution change package,
the resulting revision supersedes any entries in the listed change
packages that might be on branches.
A resolution change package is created through the Resync CP
operation. There is no way to manually create a resolution change
package.
399