You are viewing an old version of this page. View the current version.

Compare with Current View Page History

Version 1 Next »

It can often be useful to merge changes to a model into another model particularly when working in a repository or on a design imported from another modeling tool.
To show the Merge models dialog...

  1. Select the model-version you have made changes to in the tree and select REPLACE WITH THIS IMAGE: Images/Common_Icons/mergemodels.png Merge into other model (where <model> is the model type) from the Worflow pane.
  2. Select the model you want to merge your changes into and click OK.

REPLACE WITH THIS IMAGE: Images/Models/Merging Models_1.png

  1. The Merge models dialog is displayed.

REPLACE WITH THIS IMAGE: Images/Models/Merging Models_2.png

Icons/ Fields

Description

REPLACE WITH THIS IMAGE: Images/Common_Icons/Remap a Source Mapping.png

Click to Swap the version being merged with the version to merge into.

Hide equal entities

Select this checkbox to hide objects and properties that have no changes between the versions when selected.

Verbose

Select this checkbox to display values of the objects and properties that are the same between the versions when selected.

REPLACE WITH THIS IMAGE: Images/Common_Icons/expand.png

Click to Expand all items in the table.

REPLACE WITH THIS IMAGE: Images/Common_Icons/collapse.png

Click to Collapse all items in the table.

REPLACE WITH THIS IMAGE: Images/Common_Icons/diff-compare.png

Click to display a dialog displaying the old and new values of the currently selected object or property and highlighting the differences between them.

REPLACE WITH THIS IMAGE: Images/Common_Icons/refresh.png

Click to Refresh the operations in the table.

The table on the left side shows the differences between the versions and what the resolution operation will be. To adjust the operation click in the Operation column for the object and select an operation from the drop-down menu. REPLACE WITH THIS IMAGE: Images/Models/Merging Models_7.png

    • If the object or property exists in the model being merged but not in the model being merged into the options available are REPLACE WITH THIS IMAGE: Images/Common_Icons/diff-add.png Add and REPLACE WITH THIS IMAGE: Images/Common_Icons/diff-ignore.png Ignore.
    • If the object or property exists in the model being merged into but not in the model being merged the options available are REPLACE WITH THIS IMAGE: Images/Common_Icons/diff-keep.png Keep, REPLACE WITH THIS IMAGE: Images/Common_Icons/diff-delete.png Delete, and REPLACE WITH THIS IMAGE: Images/Common_Icons/diff-ignore.png Ignore.
    • If the object or property exists in both the model being merged and the model being merged into the options available are REPLACE WITH THIS IMAGE: Images/Common_Icons/diff-overwrite.png Overwrite and REPLACE WITH THIS IMAGE: Images/Common_Icons/diff-ignore.png Ignore.
    • The tree on the right side allows you to choose what types of objects and properties will be merged using the check boxes next to each object type. To update the operations in the table after making changes click the Refresh button REPLACE WITH THIS IMAGE: Images/Common_Icons/refresh.png.
      • When an object exists in one model but not the other it's not clear if it was added to one model or deleted from the other. To set the default handling of missing objects right click on the object type in the tree and select either When missing in source delete from target or When missing in source keep in target. To update the operations in the table click the Refresh button REPLACE WITH THIS IMAGE: Images/Common_Icons/refresh.png. REPLACE WITH THIS IMAGE: Images/Models/Merging Models_9.png
  1. To merge the models using the chosen settings, click OK.

REPLACE WITH THIS IMAGE: Images/Models/Merging Models_10.png

  • No labels