Preparing Files for Conflict Resolution

When a conflict is encountered during a Bringover Update transaction, Configuring takes special steps to prepare that file so that you can resolve the conflict.

Configuring incorporates the deltas created in the parent into the SCCS history file in the child. The parent and child deltas are placed on separate branches in the child SCCS history file. After the deltas are merged, the history file in the child contains:

• Delta(s) created in the parent

• Delta(s) created in the child

• The delta from which the two versions of the file are both descended (their common ancestor)

  ---

  Note -

  Versioning enables you to view graphical depictions of SCCS delta histories (including branches).

  ---

Access to the three deltas (common ancestor, parent, and child) in the child enables you to use the Resolve transaction and Merging to compare the parent and child deltas -- both to their common ancestor, and each to the other.

In addition to merging deltas, Configuring adds the name of the conflicted file to the child's Codemgr_wsdata/conflicts file. The conflicts file is a text file that contains the names of all files in that workspace with unresolved conflicts.

The stage is set for you to resolve the conflicts using the Resolve transaction.