You can update your work area with the latest changes from any version of a stream that is associated with a work area. If there are conflicts you can resolve them by:
Choosing the item revision in the work area (Use Local).
Choosing the item revision in the repository (Use Repository).
Allowing Dimensions to attempt to automatically merge the contents provided there are no conflicts.
If a conflict includes path differences these resolutions are also available:
Use local path
Use repository path
In the Update wizard use the file merge tool to manually merge the content of the files unless they are merged automatically.
NOTE If you are using a Linux client or remote area the UNIX utility diff3 must be installed for automatic merge to function. For details see the Installation Guide for UNIX.
To update a work area from a stream and resolve conflicts:
On the My Current Stream or Items tabs, in the navigation pane select the stream or folder from which you want to update the work area.
On the toolbar click the Update button. The Update wizard appears.
The Update changes from this stream box displays the name of the stream from which you invoked the update. To change the stream do one of the following:
Click Select and use the Select Stream wizard to specify a stream. Optionally select a stream version.
Enter the name of a stream, and optionally a version, in this format:
PRODUCT:STREAM_NAME;VERSION
For example:
QLARIUS:JAVA_BRANCHA;5
The Update this work area box displays the work area path that will be updated. To change the work area enter its path or click Select and choose an area.
To interactively (manually) verify the merge results before applying them to the work area, select Perform an interactive merge.
To restrict the scope of the update to a specific folder and its subfolders, select Limit the scope of the merge to this folder and browse to the folder, or enter its repository path. If you invoked the update from a subfolder its path is displayed.
Click Show Advanced.
To restrict the update to particular files or folders enter wildcard filters in:
The Include repository file box to only include specific file types.
The Exclude repository file box to exclude specific file types.
For details about using these filters see Using Wildcards to Include and Exclude Files and Folders.
To automatically merge local and repository files whose content does not conflict, select Auto merge non-conflicting file content.
To apply the repository date and time to the files in the update select Apply repository date and time.
To log the update operation select Enable logging and enter the path where the log file will be saved, or click Browse and select a folder.
Do one of the following:
If you are performing an interactive update click Next and go to the next step.
If you are not performing an interactive update click Update. The work area is updated and the results are displayed. Go to the last step.
The Review page displays the changes that have been detected. For every conflict the default resolution is Ignore.
To accept all non-conflicting changes click Accept all non-conflicting.
To ignore all changes click Ignore all.
To change the current resolution for a conflict, in the Resolution column click it and select one of the following:
• Merge: manually merge the contents of the item revisions and update the work area with the resulting file.
• Use local: accept the item revision in the work area.
• Use repository: accept the item revision in the repository and overwrite the version in the work area.
If a conflict includes path differences these resolutions are also available:
• Use local path
• Use repository path
Click Update.
Click Close to exit the wizard or click Back to return to the first page.
Related Topics