Resolving clashes - the clashes dialog (repository-based CM)
The Clashes dialog is opened when you rebase or reconcile a branch (sandbox) and clashes occur. The Clashes dialog allows you to resolve each clash by choosing whether to use the trunk value or branch value in each case.
Modeler creates a Text Diagram or Change Note in the model to record any clashes and the decisions made for those clashes. The name of the Text Diagram or Change Note begins with 'Clashes: '. If Change Tracking is enabled, Modeler creates a Change Note; if Change Tracking is disabled, Modeler creates a Text Diagram.
Clashes
When rebasing or reconciling a branch with the trunk, the following circumstances result in a clash:
• A property value of an item that has been changed in the branch and changed in the trunk since the branch was created or last rebased.
• A relationship has been changed in the branch and changed in the trunk since the branch was created or last rebased.
• An item has been changed in the branch (properties or relationships) and deleted from the trunk since the branch was created or last rebased.
• An item has been deleted in the branch and changed in the trunk (properties or relationships) since the branch was created or last rebased.
If the branch has not been rebased, the tip version of the branch is compared with the version of the trunk from which the branch was created. If the branch has been rebased, the tip version of the branch is compared with the version of the trunk from which the branch was last rebased.
When reconciling a branch with another sibling branch, the following circumstances result in a clash:
• A property value of an item that has been changed in the source branch and changed in the target branch since the both branches were created.
• A relationship has been changed in the source branch and changed in the target branch since the both branches were created.
• An item has been changed in one branch (properties or relationships) and deleted from the other branch since the branches were created.
Clashes dialog columns
The first column shows the model, items, properties and relationships involved with any clashes.
In addition to the dictionary and item type icons, the following icons are used for properties, relationships and diagram symbols.
Indicates a property.
Indicates a diagram symbol.
The second column shows the status of each item, property or relationship in the tip version of the branch you are rebasing or reconciling:
• For an item, <Modified> means that the item has been modified in the branch, <Deleted> means that the item has been deleted from the branch, and <New Usage>.means that the item has been used in a new way in the branch, for example, a Class being used as a data type.
• For a property or relationship, the value in the branch is shown.
The third column shows the status of each item, property or relationship in the tip version of the trunk:
• For an item, <Modified> means that the item has been modified in the tip version of the trunk, <Deleted> means that the item has been deleted from the tip version of the trunk, and <New Usage>.means that the item has been used in a new way in the tip version of the trunk, for example, a Class being used as a data type.
• For a property or relationship, the value in the tip version of the trunk is shown.
The fourth column shows the value of each property and relationship in the trunk version from which the branch was created or last rebased.
• When a symbol has been moved on a diagram in both the branch and the trunk, the Position property of the symbol is shown as a clash.
• If you delete an item in your branch and then reconcile the branch, the deleted item and its deleted child items are deleted from the resultant trunk version, even if a child item had been moved to a new parent item in the trunk. Likewise, when you delete an item in the trunk and then rebase a branch.
• If a diagram has been changed in the trunk and branch, after rebasing or reconciling the branch you may have to tidy up the resultant diagram.
• If you set the tagged value of an item's Tag Definition in a branch and that Tag Definition is removed from the item in the trunk, on reconciling the branch the Tag Definition is removed from the item and the tagged value you set is lost. Likewise when you set the tagged value of an item in the trunk and then rebase a branch in which the Tag Definition has been removed from the item.
Clash details dialog
When a clash is listed on the Clashes dialog, you can find out more information about the clash through the Clash Details dialog, which is opened when you select an entry, and then click the Details button.
For textual differences, the Clashes dialog shows the text value in the following versions of the model:
• The tip version of the branch.
• The tip version of the trunk.
• The version of the trunk from which the branch was created or last rebased.
For diagram differences, the Clashes dialog shows how the diagram appears in each of the preceding versions of the model. Diagram symbols involved with the clash are highlighted through a red boundary.
Determining whether branch or trunk values are used
When there is a clash that must be resolved, a check box appears in the second column (branch) and third column (trunk) for that clash. For each clash, you must select the appropriate check box to use either the branch value or the trunk value.
Through the toolbar buttons and Clash menu commands, you can select multiple check boxes in a single operation.
Button
Clash menu command
Purpose
Chose Sandbox
For a clash, selects the Sandbox check box.
Chose Sandbox and Children
For an item, selects Sandbox check boxes associated with the item and its child items.
Chose Trunk
For a clash, selects the Trunk check box.
Chose Trunk and Children
For an item, selects Trunk check boxes associated with the item and its child items.
If the selection of a check box is dependent on other check boxes being selected, when you select that check box the Clashes dialog will select the dependent check boxes. For example, if you choose to delete an item, that item's child items must also be deleted.
After you have a selected a check box for each clash, you can continue the rebase or reconcile operation by clicking the Apply button.
Menu Commands
The File menu has the following commands:
• Apply Clash Fixes - Performs the rebase or reconcile operation. This command is available only after selecting a check box for each clash.
• Apply Override - Do not use this command without first contacting PTC support.
• Exit - Closes the Clashes dialog without performing the rebase or reconcile operation.
The Clash menu has the following commands:
• Choose Sandbox - For a selected clash, selects the Sandbox check box.
• Choose Trunk - For a selected clash, selects the Trunk check box.
• Choose Sandbox and Children - For an item, selects Sandbox check boxes associated with the item and its child items.
• Choose Trunk and Children - For an item, selects Trunk check boxes associated with the item and its child items.
The View menu has the following commands:
• Toolbar - Shows or hides the Clash dialog toolbar.
• Status Bar - Shows or hides the Clash dialog status bar.
The Help menu has the following command:
• About Reconcile - Provides information about the Clash dialog.
Indicates a property.
Indicates a diagram symbol.
Details button.
Apply button.