Phase 3: Merging differences

After you have determined what you will deliver to the integration stream, the deliver operation moves into the merge phase.

In this phase, the deliver operation compares the versions being delivered from the development stream with their counterparts in the target integration stream and invokes the DevOps Code ClearCase® Merge Manager as needed.

The DevOps Code ClearCase Merge Manager automatically resolves trivial differences. Trivial differences are those that can be resolved without your manual intervention.

For nontrivial differences, DevOps Code ClearCase Merge Manager prompts you to resolve them manually when the merging occurs.

For learning about the merge operation and working in the Merge Manager, go to the Merging your work module.