Merging Conflicts

The Merge conflicts feature enables you to merge items that exist in the target environment but not in the snapshot you are promoting.

The following items are merged when you select the Merge conflicts check box on the Entities screen of the Promote dialog box during a promotion. If the check box is cleared, these items are deleted from the target environment during promotion:

Roles and role assignments
Notification subscriptions
Single Selection, Multi-Selection, User, Multi-User, and Multi-Group field values
Default values for Single Selection, Multi-Selection, User, Multi-User, and Multi-Group fields
Note: Default value overrides specified in the snapshot for these field types will overwrite overrides that exist in the environment.

There is no actual "merging" of e-mail templates. For e-mail templates with the same name in both environments:

If the Merge conflicts check box is selected when you promote, the e-mail template in the snapshot is ignored; the e-mail template in the target environment is not overwritten and remains unchanged.
If this check box is cleared, the e-mail template in the target environment is deleted and replaced by the e-mail template in the snapshot.

Tip: If you have changes to preserve in both environments, manually merge changes into the template in one of the environments and then select or clear the Merge conflicts check box accordingly to preserve those changes.

For best results, follow these tips:

Always select the Merge conflicts check box when you promote a snapshot for the first time. This eases the application administration process by ensuring that the user who promotes the snapshot is automatically enabled for all roles in the promoted applications.
If you select the Merge conflicts check box when you promote a snapshot, you should "get" the process app from the SBM Application Engine. This adds the latest runtime version of the process app into the repository and ensures you do not lose changes made by the merge. For details, refer to Getting a Process App from SBM Application Engine.