Resolving Conflicts During Check In

The Merge Changes to Repository Document dialog lets you inspect and approve (or reject) the changes you are checking into the repository. To filter the tree and show only the changes, click the Change Filter tool and select Show All Changes. By default, all your changes are selected to be applied.

The window is divided in three parts:

The Object comparison pane in the upper part of the window displays the anticipated result of the merge on the target model. Click the Show Source Model button at the top left of the pane to split the pane between the source and target models.
The Property comparison pane in the middle of the window displays the properties of the nodes selected in the model tree, listing the name of the property and its values in the From and To models.
The Check in comment pane lets you edit the comment that will be associated with this check in.

For detailed information about using this dialog, see Merging Models.

You can instruct PowerDesigner to handle all or some of these conflicts (and thus suppress the display of the Merge dialog) by deselecting the Review changes option in the simplified Check In Document dialog or from the Check In Options dialog, which you open by:

Clicking the Options button at the bottom of the advanced Check In Document dialog.
Clicking the Check In Options tool in the Check In Project or Check In Multiple Documents dialog. The options specified will apply to all the models and files being checked in.

The following modes are available:

Interactive - [default] Always opens the Merge Changes to Repository Document dialog to let you review and approve or reject each change before check in.
Batch - Automates the merging of changes and treats conflicts (where the same object has been modified both by you and by another user) using one of the following rules:
- Use my changes – applies your changes and overwrites changes in the repository version (even if they are to different attributes).
- Keep repository changes – retains the changes in the repository and rejects your changes (even if they are to different attributes).
- Resolve manually – opens the Merge Changes to Repository Document dialog to let you review and resolve conflicts.