User Guide - MKS

Chapter 12: Advanced Change Package Operations
Resolving
Conflicts
354
If developers resynchronize only a single file into their sandboxes, their
builds may break because of new dependencies in the code. Such broken
builds cause delays and prevent the team from completing their work on
time. However, it is possible to avoid this lost time by using the Resync CP
and Resync By CP commands.
Resync CP allows developers to specify a change package and have all
changes associated with that change package resynchronized into their
sandboxes. The commands save development time because they:
automatically search for the required files
determine what other change packages the selection is dependant on
(this is known as the backfill list) and also resynchronize those change
packages into the sandbox
If the developer is working on a file conflict, Resync CP and Resync By CP
also merge new information into a file. The merge operation ensures that
the sandbox is up-to-date and that no changes are lost.
The Resync CP and Resync By CP commands also allow a developer to
remove a bug fix or feature that is incomplete or not working.
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 can do one of the following:
use the Resync CP command to create a resolution change package. A
resolution change package is a specialized change package that
records all applied change packages, resolved conflicts, checked in
modified files, and conflicts resolved by merging.
use the MKS Visual Merge tool to resolve conflicts and perform
merges. Depending on your preferences, Visual Merge may appear by
default for conflict resolution. For information on using Visual Merge
for conflict resolution, see “Working With MKS Visual Merge” on
page 330. For information on the MKS Visual Merge tool, see “MKS
Visual Merge Interface” on page 101.
The newly created 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 no merges are required and the Apply CP operation succeeds, the
changes are made in the project.
u s e r g u i d e