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:
There is no actual "merging" of e-mail templates. For e-mail templates with the same name in both environments:
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: