Field
Description
Rules and Guidelines
Update directory
The folder in the work area that is to be updated with the contents of the selected folder in the stream in the repository.
Display only.
Accept all non-conflicting
Click this button to set the resolution for all changes (except conflicts) between the repository and the work area to accept on the current page.
Ignore all
Click this button to set the resolution for all changes between the repository and the work area to ignore on the current page.
Accept all non-conflicting on all pages
Click this button to set the resolution for all changes (except conflicts) between the repository and the work area to accept.
Only appears if there is more than one page of changes.
Ignore all on all pages
Click this button to set the resolution for all changes between the repository and the work area to ignore.
Only appears if there is more than one page of changes.
Page selection
Select an option for the page you want to display: Next, Previous, or a specific page number.
Only appears if there is more than one page of changes.
File Name
Icon indicating if this is a file or folder, followed by the name of the file/folder (relative to the selected folder in the stream)
The name of the file or folder in the work area that is to be changed (relative to the selected folder in the stream) preceded by an icon:
for a file.
for a folder.
Change Type
The type of change in the repository compared with the work area.
Resolution
Select the action that you want the Update wizard to take for this change.
-
Accept to accept the change.
-
Ignore to ignore the change.
-
Auto Merge if there is a conflict and you want the web client to automatically merge the file contents.
-
Use local if you want to use the version of the change in the work area.
-
Use repository if you want to use the version of the change in the repository.
Show a more detailed log message
Click this link to display further details of the updates to take place.