Share this page
Merge Item wizard
Use this wizard to merge two or more item revisions and/or workfiles using the File Merge Tool.
See Attributes tab/page for how to view and change the user-defined attributes.
Starting Item Revision or File page
Use the Starting Item Revision or File page to identify the type of merge you want to perform and the starting revision/file involved.
| Field | Description |
|---|---|
|
Item |
Shows the specification of the selected item revision. |
|
Item-based merge |
Select this option to use a revision of the selected item as the starting revision for the merge. If you have selected a specific item revision, this option is set to the selected revision. If you are performing a Resolve Merge Conflicts, select a revision from the list. |
|
File-based merge |
Select this option to use a workfile, or create a new workfile, on disk as the starting point of the merge. Enter the file name and path, or use the browse button to select the workfile. If you have selected a file in the My Area view, this option is set to its file and pathname. |
Merge Revisions/Files page
On the Merge Revisions/Files page, include additional item revisions and/or files in the merge along with the selected base and ancestor.
| Field | Description |
|---|---|
|
Merge with these revisions |
If required, select one or more revisions from the list. Not available if File-based merge has been selected on the first page. |
|
Merge with these files |
If required, click the Add... button and browse for the required file. To remove a file from the list, click Remove. |
Merge Target page
On the Merge Target page, choose the output of the merge. You can save the output as an item revision or a workfile, or update the item pedigree to record that the base revision has been merged without merging the contents.
| Field | Description |
|---|---|
|
New revision |
Select this option if you want the target of the merge to be a new revision of the item. Not available if File-based merge has been selected on the previous page. |
|
Branch |
Shows the branch for the selected item. If required, select a new branch. Not available if File-based merge has been selected on the previous page. |
|
Revision |
Shows the new revision ID, incremented by one from the previous revision ID. If required, enter a new revision ID. Not available if File-based merge has been selected on the previous page. |
|
Mark revisions as already merged with selected start revision |
Select this option to update the item pedigree to show the item revisions as already having been merged without invoking the merge tool. Not available if File-based merge has been selected on the previous page. |
| Merge to a file | If you want to use a workfile on disk as the output target of the merge, select the radio button and use the browse button to select the workfile. |
Merge Options page
On the Options page, specify additional options if you are using a new item revision as the output for the merge.
| Field | Description |
|---|---|
|
Request ID |
Enter a request ID, or click the Browse button to find a request. The request specification has the following format: productID_changedocType_ number |
| Status | Select a status for the merged item. |
|
Expand Substitution Variables |
Select this option to enable item header substitution. For details, see Merge Item wizard. |
| Automatic Merge | Automatically merge non-conflicting items without displaying the merge tool window. |
| Reason for Item Merge | Enter a brief description of the merge. |
Merge Attributes page
On the Attributes page, set or change the user-defined attributes for the target item revision.
The attributes you see depend on the following:
-
The type of item.
-
The role section you choose (the set of attributes that are relevant to a user with that role).
-
The item.
| Field | Description |
|---|---|
|
Role Section |
Select a role to limit the attributes shown to only those that are relevant to a particular role. Attributes can be made role-specific in the Administration Console. |
|
Attributes |
The user-defined attributes associated with the role. Attributes in italics cannot be changed. Attributes in bold require a value. |
| Values | For each attribute, enter a value, or select one from the list (if present). |
Merge Summary page
On the Summary page, review the selections you have made and complete the merge, or return and change your selections if necessary.
The text box summarizes the details of your selected merge.
See also:
