Select workspaces to merge and then select the artifacts to merge in the Object History window. When merging, you can create new workspaces under the source and target workspaces, and have them baselined. Alternatively, you can merge directly from a source into a target workspace.
1: Select source and target workspaces
Select the source and target workspaces. The process creates a workspace for merged workspaces, and then opens the Object History window to select the artifacts to merge.
The Merge workspace wizard guides you through selecting the source and target workspaces.
1 Open the Source workspace, and then click Tools > Collaboration > Merge Workspace.
The Merge Workspace dialog appears. The Source Workspace field contains the current workspace. Optionally, you can select a different workspace.
2 Click the ellipsis (...) in the Target Workspace field.
The Encyclopedia Workspaces dialog lists the workspaces for you to select as a target. Workspaces that you cannot select as targets are shown with strikethrough line across their names.
3 Select your target workspace, and then click OK.
4 In the Merge Options field, select your preferred action.
•If you choose Merge directly into source and target workspaces (the default option), go to step 6.
•If you choose to Create new workspaces under the source and target workspaces, go to step 5.
5 In the Merge Workspace field, enter a name for workspace that is to be created for the merged content. A workspace with the name you enter is created under the source and target workspaces.
The workspace under the source is the active workspace while you are in the process of merging. Unless you manually merge some objects, this workspace is empty and you can delete it after you complete the merge.
6 Click Next. The Merge Workspace dialog informs you that the Object History window will open in merge mode, for you to select objects to merge.
7 Click Next > Next. The wizard closes and the Object History window opens.
2: Select and merge artifacts in the Object History window
In the Object History window, you can decide how to handle collisions by viewing side-by-side comparisons of an artifact in the source and in the root workspace. With the “Property Comparison” option, you can also select an artifact and see how it differs from the same artifact in the root workspace. The Source Change column displays icons that distinguish artifacts that were deleted, modified, or added in the source workspace.
The selected source and target workspaces are baselined during the merge to prevent further changes. However, during the merge process, you might have to manually merge those objects that changed in the source and in the target. If that is necessary, the objects that you modify are in the source workspace.
Move the pointer over an icon in the window to see a description of what it does.
1 In the Source column of the Object History window, check the artifacts to merge. In the Merge column, a red exclamation point icon means that there were changes found in both the source and target workspaces.
2 Click the Complete the merge process icon.
The Merge Workspace dialog confirms that the merge process is ready to be completed. It also displays the names of the source, target, and new workspace that is to be created for the merge.
3 Click Complete.
When the merge completes, a report window opens and lists the diagrams and definitions that were added, replaced, not replaced, or deleted. Depending on the Merge options that you selected, for step 6 of the procedure above “1: Select source and target workspaces”, you get the following results:
•If you chose Merge directly into source and target workspaces, the target workspace is opened when you conclude the merge. This becomes the default workspace. The source and target workspaces are not baselined, and no child workspaces are created.
•If you chose Create new workspaces under the source and target workspaces, the target workspace is baselined and the workspace you created for the merge becomes a child workspace of that target workspace.