The conflict resolution wizard helps you resolve thirteen overlapping conflicts.
These conflicts are marked with the conflict icon (
) in the My Merge Changes view. For each overlapping conflict, the wizard identifies the object (for example, element, attribute, content, file, reference, or URL) that is different and the name of child or parent release, as noted in following table:
| Type of Conflict | Description |
|---|---|
| Different Attribute Value | An attribute's value was changed to one value in the child release and to another value in the parent release. |
| Different Content | Content in an XML element was changed to one value in the child release and to another value in the parent release. |
| Different Moves within the Same Parent | Sub-elements within an XML element were rearranged one way in the child release and rearranged another way in the parent release. |
| Different References | A reference element was modified to point to different objects in the child release and the parent release. |
| Element Modified and Deleted | An XML element was modified in one release and deleted in the other release. |
| Element Moved and Deleted | An XML element was moved in one release and deleted in the other release. |
| Element Moved Distantly and Deleted | An XML element was moved in one release and deleted in the other release. |
| Element Moved to Different Locations | An XML element was moved in the child release and to a different place in the parent release. |
| Element Moved to Two Distant Locations | An XML element was moved in the child release and to a different place in the parent release. |
| Element Name Changed | The name of an XML element was changed to one value in the child release and to another value in the parent release. |
| External File Modified | A file URL was modified differently in the child release and the parent release. |
| File Modified | A file was modified differently in the child release and in the parent release. |
| Insert Different Elements | An XML element had different sub-elements inserted in the child release and in the parent release. |