Complete these steps to download changes from the stream in Dimensions to your local work area. This includes files that other users have modified, added, moved, and renamed. You must also update your work area before proceeding with a delivery of local changes if there are conflicts between your local files and files in the Dimensions repository.
To update your work area with changes from Dimensions:
Select the project in the Solution Explorer.
Click the Update button, or select File | Source Control | Update. The Update wizard appears.
Complete the following on the first page of the Update wizard:
|
Click the Next button. The next window displays the differences between your local work area and the repository.
If necessary, change any of the following default options on the Defaults tab. These settings apply to all applicable files included in the update unless overridden for specific files:
Relate to request: A request ID to relate to the files you are downloading.
Permissions after Update: Choose whether to make files that you are downloading writable.
To set any of the above options to a unique value for specific files, select a file and click the Options tab. Here, you can override the setting with unique values.
Scan the differences for any files that are in conflict. These are identified by the word Conflict in the Change Type column. A description of the conflict is displayed on the Details tab. Click the appropriate button on the toolbar to select the resolution, or if you want to merge the content of the two files that are in conflict do the following:
Click the Merge button to launch the Serena Merge Tool to compare the contents. You can configure other merge tools to be used for this as well (see the Serena Administrator’s Guide for more information).
Use the Merge tool to resolve the conflicts. See the Merge tool online help for more information. The file resolution is now shown as Merge.
Repeat these steps for each file that is in conflict.
Click Next and complete the update.
See the Dimensions User’s Guide for detailed information on using and merging development streams.