Dimensions provides flexibility in the choice of email templates and customized email templates . When properly configured, these can be configured to allow searching a number of directories in order for the desired template.
There is no actual "merging" of email templates . 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.