Resolving all conflicts
In the Pending Changes view, you can resolve all conflicts by performing merges.
Procedure
To resolve all conflicts in the current view:
-
Open the Pending Changes view. In the ClearTeam
Navigator,
select the ClearCase® view in which you want
resolve all conflicts. Right-click the view and select from the context menu in the ClearTeam
Navigator
or click the Show Pending Changes icon
on the ClearCase toolbar.
- In the Pending Changes view, if you have conflicts, click
on the Resolve All Conflicts icon
on the Pending Changes view toolbar to begin the process of resolving the conflicts. If necessary, merge tools are invoked.