There are 29 types of changes identified by Astoria Release Management that do not require the guidance of the conflict resolution wizard.
Astoria is able to resolve the changes without input from you. These changes are marked with the information icon (
) in the My Merge Changes view. The following table lists these types of changes:
| Type Of Change | Description |
|---|---|
| Attribute Value Changed in Source | An attribute's value was changed in the source release and applied to the target release. |
| Attribute Value Changed in Target | An attribute's value was changed in the target release. |
| Content Changed in Source | Content within an XML element was changed in the source release and applied to the target release. |
| Content Changed in Target | Content within an XML element was changed in the target release. |
| Delete Same Elements | An XML element was deleted in the source release and in the target release. |
| Element Name Changed in Source | The name of an XML element was changed in the source release and applied to the target release. |
| Element Name Changed in Target | The name of an XML element was changed in the target release. |
| Elements Deleted in Source | One or more XML elements were deleted in the source release, and this change was applied to the target release. |
| Elements Deleted in Target | One or more XML elements were deleted in the target release. |
| Elements inserted in Source | One or more XML elements were inserted in the source release, and this change was applied to the target release. |
| Elements inserted in Target | One or more XML elements were inserted in the target release. |
| Elements Moved in Source | One or more XML elements were moved in the source release, and this change was applied in to the target release. |
| Elements Moved in Source | One or more XML sub-elements within an XML element were rearranged in the source release, and this change was applied in to the target release. |
| Elements Moved in Target | One or more XML elements were moved in the target release. |
| Elements Moved in Target | One or more sub-elements within an XML element were rearranged in the target release. |
| External File Modified in Source | An external file was modified in the source release, and this change was applied in the target release. |
| File Modified in Source | A file was modified in the source release, and this change was applied in to the target release. |
| Insert Same Elements | An XML element had the same elements inserted in the source release and in the target release. |
| New Document Created in Source | A document added to the source release was copied to the target release. |
| New External File Created in Source | An external file added to the source release was copied to the target release. |
| New File Created in Source | A file added to the source release was copied to the target release. |
| Reference Changed in Source | A reference element was changed in the source release and applied to the target release. |
| Reference Changed in Target | A reference element was changed in the target release. |
| Same Attribute Value | An attribute's value was changed the same in the source release and in the target release. |
| Same Content | Content in an XML element was changed the same in the source release and in the target release. |
| Same Element Name | The name of an XML element was changed to the same value in both the source release and the target release. |
| Same Moves To The Same Distant Location | An XML Element was moved to the same place in the source release and the target release. |
| Same Moves Within The Same Parent | Sub-elements within an XML element were identically rearranged in both the source release and in the target release. |
| Same References | A reference element was modified to point to the same object in source release and the target release. |