Reviewing a Change in the Synchronize Wizard

Purpose

Review a change in the Synchronize Wizard when:

You want to change the resolution that the Synchronize Wizard has determined for the change.
There is a conflict between two versions of a file and you need to decide which version of the file to use, or you want to merge the contents of the files.

To review a change in the Synchronize Wizard:

Select a file or folder for which there is a change or conflict. This will have an entry under the Change Type column, and its icon is something other than for a file, or for a folder.

NOTE A folder rename is interpreted as an addition and a deletion.

Click the filename or file icon to select a file.
To move to the next file where there is a difference, click the button.
To move to the previous file where there is a difference, click the button.
To move to the next file where there is an unresolved conflict, click the button.
To move to the previous file where there is an unresolved conflict, click the button.
To view the item history for a file, right-click the file and select History. The item History dialog is displayed.

You will see a description of the change by clicking the Details tab below, and the current resolution is displayed in the Resolution column in the tree against the file or folder.

The Resolutions column shows the resolution that the Synchronize Wizard has chosen. Other possible resolutions that you can choose are represented by buttons in the toolbar. The buttons that are available depend on the change type. If you wish, click the appropriate button to select another resolution.

To ignore the file or folder, i.e. exclude it from the synchronization, click the button.
To use the version of the file or folder from the work area, click the button.
To use the version of the file or folder from the repository, click the button.

CAUTION! When selecting the options Use local or Use Repository, you need to be aware of the implications of the action will be taken. Choosing one or the other of these could cause you to discard a change that you have made when you did not intend to.

Your selection is then shown in the Resolution column in the tree.

If you want to compare the content of a file with the item in the repository click the Compare button By default, this will launch the default merge tool to compare the contents. See Using the Serena Merge Tool, or use the online help in this tool. You can configure other merge tools to be used with Dimensions CM. See the System Administration Guide for details of how to do this.

If the change type is Conflict, and you want to merge the content of the two files that are in conflict, click the button. If a conflict exists in the file content, this will launch the file merge tool in merge mode.

NOTE When certain types of conflict occur relating to a move and modification, you may be presented with an Accept option with the options:

• Rename and modification

• Just the modification

Under Options, there is a group of fields. These vary according to the type of change and whether the action to be taken will result in the deliver or update of a file. Accept the defaults or optionally, enter or change the values:

Comment. If the synchronization requires updates to the repository, you might need to enter a comment for any new item revisions that are created if your process model requires this.
Requests. If your process model requires you to enter a request when creating new item revisions, enter one or more requests in this field.

NOTE You cannot check out an item in response to a request if the request is above the initial stage in the Global Stage Lifecycle.

Item Specification. The item specification for a new item.
Item type. The item type for a new item. If you want to choose a different item type, click the field and select one from the drop-down list.
Format. Enter a file format for a new item.
Design Part for new files. The part specification for the owning design part to be used for a new item.
New Revision. If you want to change the default branch and revision for a new item revision, type it in this field.
Permissions after update. If the file is being updated in the work area, select the permissions it will be given.
Permissions after deliver. If the file is being delivered to the repository, select the permissions it will be given after the deliver.