Use this dialog box to merge two or more revisions in the Serena Merge Tool.
Use the General tab to identify the revisions you want to merge.
See Merge Options Tab for how to add additional information to the new revision.
See Attributes Tab/Page for how to view and change the user-defined attributes.
NOTE If you have not selected the Install native components option, you will receive an error message when Dimensions CM attempts to invoke the merge tool. See Configuring your Computer for the Web Client for details of how to do this.
General Tab
Field |
Description |
Rules and Guidelines |
Base |
Revision Select the item revision to use as the base revision for the merge. |
If this field is not displayed, click the Use revision link. |
|
Workfile Click the Browse button and find the file to use as the base for the merge. |
If this field is not displayed, click the Use workfile link.
|
Revisions |
Select revision(s) of this item to compare to the base item revision.
|
|
Workfiles |
Type a path and filename of a workfile to compare to the base item revision, or click the Browse button to find a workfile.
|
|
Merge Into |
Select New Revision, Existing revision or Workfile. |
You do not need to complete the Merge Options tab if you select Workfile. If you select Existing Revision, this only updates the item pedigree to record the fact that it is the result of the merge. It does not update the item contents or invoke the merge tool. |
Output File |
Type a path and filename for the merged file, or click the Browse button to find a file. |
This field is only displayed if you select Workfile in the Merge Into field. |
New revision name |
Type a new revision name. |
This field is only displayed if you select New revision in the Merge Into field. |
New named branch |
Select a branch name from the list. |
This field is only displayed if you select New revision in the Merge Into field. |
Target revision |
Select the existing revision that you want use to contain the merged file. |
This field is only displayed if you select Existing revision in the Merge Into field. |
Related Topics