User Guide - Mks.com

Working With a Resolution CP
when an Apply CP operation has failed due to unresolved conflicts that
require merging. Resolution change packages are created through the
Resync CP operation and cannot be manually created by the user.
In addition, you can only apply one resolution change package during
each Apply CP operation, and if you select a resolution change package,
you cannot apply any other change packages during that operation.
Therefore, the applied changes are strictly limited and defined. Anyone
wanting a specific set of changes can then select the associated resolution
change package, run the Apply CP command, and obtain the same results.
What Is a Resolution Change Package?
A resolution change package is similar to a normal change package except
that it contains additional information on:
change packages that are to be applied
modified files that have been checked in
conflicts that have been addressed by merging
When Should I Use a Resolution Change Package?
You need to use a resolution change package if an Apply CP operation has
failed because merging is required and you want to record all merge
operations required to address the issue. To record accurately the results of
the required merge operations, you should use a resolution change
package.
Resolution change packages are particularly useful for assisting
buildmasters to complete their work. When an Apply CP operation has
failed, developers can identify the dependencies and required merges, and
include all the necessary changes in a single resolution change package.
The buildmaster can then redo the Apply CP operation using that
resolution change package. This reduces the amount of decision-making
required of the buildmaster and allows developers to resolve the conflicts
in their own files.
How Is a Resolution Change Package Created?
A resolution change package is created only through the Resync CP
operation. Using the graphical user interface, you can select an existing
change package—or create a new one—and then ask Source Integrity to
use this as a resolution change package. The only requirement is that the
change package must be in the Open state.
The change package you ask Source Integrity to use may or may not
contain entries (that is, files), but for the greatest level of control in isolating
a feature or issue, it is preferable to start with an empty change package.
429