Resolving Conflicting Item Revisions in a Project

Purpose

Resolve conflicting item revisions after merging projects if you have received an email notifying you of conflicts when merging projects. You can resolve conflicts manually or automatically.

This operation is not available for streams.

You can resolve conflicts by manually selecting item revisions or you can resolve:

Any conflicting item revisions within an entire project
Any conflicting item revisions related in response to a selected request

If there are items which have conflicting lines, versions of a line that differ between different derivatives, you have to resolve them manually. For manual file merging, Dimensions CM invokes the Serena Merge Tool. Follow the instructions in the online help for this tool or see Using the Serena Merge Tool. in the Serena® Dimensions® CM User's Guide

PRIVILEGES
Add Item Revisions to Project
Remove Item Revisions from Project

To manually resolve item revision conflicts:

In a Project containing conflicting item revisions, select one or more item revisions.
Select Item | Resolve Merge Conflicts.
In the Resolve Project Merge Conflicts dialog box, select the item specification and click Resolve.
On the General tab of the Resolve Merge Conflicts dialog box, from the Item Revisions list select the item revisions you want to merge.
Optionally, select a New Named Branch, and type a New Revision value, if you want to override the default values.
Click the Options tab and do the following if required:

For Request ID, type the name of the related request, or click the browse button: and use the Find dialog box to find it.
From the Status list select a status.
Enter a comment in the Reason for Item Merge field.

Click the Attributes tab, and type or select values.

Attributes in bold are required. Attributes in italics cannot be modified.

Click OK. The Serena Merge Tool opens. Resolve all the conflicting lines between the files. Follow the instructions in the online help or see Using the Serena Merge Tool in the Serena® Dimensions® CM User's Guide.
When you have completed the merge, close the Serena Merge Tool. You will be returned to the Resolve Project Merge Conflicts dialog box.
Repeat steps 3–9 for each item in the Conflicting Revision Item Specifications list.

To automatically resolve item revision conflicts:

Do one of the following:

For a project containing conflicting item revisions, select the top-level folder and. select Project | Resolve Merge Conflicts.
For items related in response to a request, select the request and select Request | Resolve Merge Conflicts.
For a subfolder within a project, right-click the folder in a project folder tree, and select Resolve Merge Conflicts.

In the Resolve Merge Conflicts dialog box:

If you have selected a project subfolder, and you want to include items in its subfolders, select Include items related to sub folder.
If you have selected a request, and you want to include items related to its child requests, select Include items related to child requests.

Do one of the following:

To automatically resolve one of the conflicting items, select the item specification and click Auto Resolve.
To automatically resolve all of the conflicting items in the list, click Auto Resolve All. If there are any item conflicts that Dimensions CM cannot resolve automatically, the Serena Merge Tool opens for those items enabling you to resolve the conflict manually, in which case follow steps 5 and 6 for each of these items.

If Dimensions CM is able to automatically resolve the conflict, the item will disappear from the Conflicting Revision Item Specifications list.
If the conflict cannot be resolved automatically, the Serena Merge Tool opens for you to resolve the conflict manually, in which case, do the following:

a Resolve all the conflicting lines between the files, follow the instructions in the online help or see Using the Serena Merge Tool in the Serena® Dimensions® CM User's Guide.

b When you have completed the merge, close the Serena Merge Tool. You will be returned to the Resolve Project Merge Conflicts dialog box and the item will have disappeared from the Conflicting Revision Item Specifications list.

Repeat step 3 to 5 for each item in the Conflicting Revision Item Specifications.