User Guide - MKS

Using a
Resolution CP
Working With a Resolution CP
development path so that it can be incorporated into the next product
release? The Resync CP command is the best option for applying the new
fix.
A PT developer can now create a second change package, 1204:2 for the
same issue. The second change package would include the summary
“Applied fix to main development path”. The PT developer would start
the Resync CP command, select the main development sandbox, and the
first change package—1204:1—in this issue. The second change package—
1204:2—would be used as a resolution change package.
Once all merges have been resolved, the changes are checked into the
resolution change package. The resolution change package is then closed.
The bug fix is now addressed in both the main and variant development
paths, ensuring that the problem is fixed in the Release 2.0a and the next
major product release.
The basic process for resolving conflicts is to apply the target change
package using the Apply CP command. If the Apply CP operation fails
because of a merge conflict, you must then use the Resync CP command to
create a resolution change package. That resolution change package is then
applied to the project using the Apply CP command.
The process involves the following key steps:
Use the Apply CP command to apply a change package to the main
trunk of development.
If Apply CP fails due to a required merge, use the Resync CP
command on the same change package and create a new resolution
change package. Resync CP places the required files, locked, in your
sandbox.
Verify the merges to ensure they are correct.
In your sandbox, check in the members, making sure to associate them
with the newly created resolution change package.
Close the resolution change package.
Apply that resolution change package to the project.
The Apply CP command works directly in the project, adding and
dropping files, and updating file revisions as required to apply the
resolution change package and update the project.
It is important to note that while Resync CP can be used to apply a
resolution change package, the results may not always be acceptable. For
example, if your bug fix is in an existing project member, there would
401