Resolving Conflicts
The Apply CP command detects as potential conflicts:
• files that have been dropped or moved, but would be re-added by Apply CP due to a revision update on that file in the set of change packages processed
• file additions due to a revision update in the set of change packages processed, where an alternate member using the same backing archive already exists
File additions due to an explicit request to add them from the set of change packages processed are not considered conflicts.
If merging is required, the Apply CP operation fails. You need to use the Resync CP command to merge files and resolve merge conflicts, tracking the changes and resolved conflicts in a propagation change package.