Merging Changes

A merge operation requires you to perform several activities.

Considerations Before Merging
Before you perform a merge, consider these issues.
Starting a Merge
After making changes to objects in either a parent or child release, you can start a merge operation to apply the changes to the other release.
About the My Merge Changes View
The My Merge Changes view allows you to examine candidate merge objects for a pending merge, remove objects from the merge, and resolve any conflicts found in the merge.
Examining Results in My Merge Changes View
When you click OK in the Merge Started confirmation, the My Merge Changes view appears.
Removing an Object from a Merge
After starting a merge and examining the results, you can remove an object from the merge operation.
Undoing a Merge
After starting a merge operation and examining the results, you can undo the merge, which cancels the entire operation.
Resolving Merge Conflicts
If the Merge Started confirmation indicates conflicts in the results, you must resolve them before completing the merge operation.
Completing a Merge
After examining the pending changes for the merge and resolving any conflicts, you can complete the merge operation.