Use this wizard to:
Review the changes to be applied when you are updating a work area or merging streams via a work area.
Change the default resolutions.
Resolve conflicts.
For each conflict do one of the following:
Select a resolution from the toolbar.
Right-click and select a resolution.
|
Toolbar button or context menu option |
Description |
|
Previous Difference |
Selects the previous item that has a difference. |
|
Next Difference |
Selects the next item that has a difference. |
|
Previous Unresolved Conflict |
Selects the previous item that has a conflict where no resolution has been selected. |
|
Next Unresolved Conflict |
Selects the next item that has a conflict where no resolution has been selected. |
|
Compare |
Opens your default file merge tool and compares the item in the work area with the item in the repository. |
|
History |
Displays the history of the selected item. |
|
Pedigree |
Displays the pedigree of the selected item. |
|
Hide Ignored |
Hides items that have the resolution Ignored. |
|
Accept |
Accepts this item (so that it will be updated or merged). |
|
Merge |
Opens your default file merge tool and merges the item in the work area with the item in the stream. |
|
Ignore |
Ignores the item so that it is not updated or merged. |
|
Use local |
Uses the version of the selected item or folder in the work area. |
|
Use repository |
Uses the version of the selected item or folder in the stream. |
|
Use local path |
Uses the path of the selected item or folder that corresponds to the work area. |
|
Use repository path |
Uses the path of the selected item or folder that corresponds to the source of the merge or update in the repository. |
When you select an item, the following information is displayed below:
Changes details: the type of change and a description.
Resolution: the default resolution. You can select a different resolution from the list.
Local: the specification and owner of the item in the work area.
Repository: the specification and owner of the item in the repository.
After you have resolved all conflicts click Update or Merge.
After a merge operation has completed successfully you will be prompted to deliver the files to the repository.