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:

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:


The following modes are available: