In a merge operation, an unresolved difference that involves multiple locations (such as a move) is represented by multiple nodes in the merge output pane. However, only one of the contributor values can be selected for the merge output. In the following example, the name element moved:
In the example, each of the two name node locations has a corresponding merge point in the output pane. You can verify the difference locations by clicking Next Location.
You resolve all of the merge points for a difference at once, by picking
one of the locations. Assume that for this difference, you do not want to
accept the move. In the next figure, the difference has been resolved by clicking
the first Merge
from contributor button, choosing the base contributor.
In the merge output pane, both merge points are resolved at once: the first merge point has no value and is replaced by a placeholder; the second merge point is replaced by the name node from the base contributor (your implicit choice). When you save the merge output, the XML files will include only the node that contains a value, not the placeholder.