We are currently unable to merge changes in Message Definitions and Export Mappings when they are applied to the same file, but in different branches.
Imagine we have a Development branch and 2 feature branches: FeatureA and FeatureB. When work on each feature branch is complete, they are merged into the Development branch for acceptance testing.
FeatureA has work performed on a message definition file and its related export mapping file by Developer 1. This is then merged into the Development branch by Developer 1.
FeatureB has work performed on the same message definition and its related export mapping by Developer 2. This is then merged into the Development branch by Developer 2, who is notified of merge conflicts between the 2 files.
There appears to be no way to accept both changes, even though they related to difference associations and attributes in the export files.
It would be good to be able to accept both changes, the way we can with the domain model.
See support request #258265 for additional details.