Resolve Transaction

The Resolve layout of the Transactions window facilitates resolving conflicts detected during Bringover Update transactions. The Resolve transaction coordinates the merging process, acting as intermediary between you and TeamWare Merging.

When Configuring detects a conflict during a Bringover Update transaction, it does the following:

• Merges new deltas from the parent into the SCCS history in the child

• Enters the file's path name in the child's Codemgr_wsdata/conflicts file

By default, Configuring automatically processes sequentially the list of files from the File List pane. After you resolve a conflict, Configuring automatically begins to process the next file in the list. If you want to change the behavior so that it individually processes only files that you select explicitly, deselect the Auto Advance checkbox in the Resolve pane of the Tool Properties dialog box.

Conflicts need not be resolved immediately. You can continue to make changes and create new deltas in conflicted files in the child workspace. New deltas are created on a branch; when you finally resolve the conflict, the latest delta is the one merged with the version brought over from the parent. Conflicts must be resolved before you can put back the files to the parent.

When Configuring creates the new delta in the child SCCS history file, it includes the following standard comment:

By default, Configuring does not prompt you for a comment to append to its comment. If you want to be prompted for comments that are appended to the standard comment, select the Prompt for Checkin Comments checkbox in the Resolve pane of the Tool Properties dialog box.

To resolve conflicts in a workspace:

1. Double-click on the icon of a workspace that contains conflicted files.

   The Resolve layout of the Transaction window opens with the names of its conflicted files displayed in the File List pane.

2. Select a file in the File List pane and click Merging.

   Configuring starts Merging and begins to process the list of files in the File List pane. For each file in the list, Configuring extracts the parent delta, the child delta, and the common ancestor from the SCCS history file and passes their path names to Merging. The Merging window opens with the files loaded and ready for merging.

3. Use Merging to resolve the differences between the parent and child versions of the file.

   See Chapter 13, Starting Merging and Loading Files" for more information.

4. Save the file in Merging.

   After you use Merging to resolve differences between the parent and child versions of the file, Configuring creates a new delta in the child SCCS history file and removes the file name from the conflicts file. The new delta contains the merged result you created using Merging.