Resolve Tab

Related Topics:

Resolving Differences Between Files Using Merging

Use the Putback tab in the Transactions Dialog Box to resolve open conflicts in a workspace. To open the Resolve dialog box, in the Configuring Window, choose Actions Resolve.

In this tab are the following components:

Workspace Text Box

Shows the name of the child directory where conflicts occur.

Files in Conflict Pane

Displays the names of the conflicted files.

Buttons

Merge Conflicts	Opens the Merging Window, where you can resolve conflicts between files.
Reload	Loads conflicts from the conflicts file.
Close	Closes the Resolve dialog box.
Help	Displays online help for this tab.