Understanding the Three-way Merge window

Once you have clicked Edit conflicts in the Model Collection Editor, the Three-way Merge window is displayed:

Figure 369: Three-way Merge window

This window has the familiar comparison tree, this time in a three-way view, as opposed to Model Comparison's two.

It also has a merge output tree at the bottom, which lists all the locations at which a choice is necessary (i.e. where a difference exists between any of the three models) in order to perform a successful merge.

In Three-way Merge, the color code for highlighting differs from that of Model Comparison:

• Unresolved conflict: this indicates a difference between:

mine and theirs and

mine and base, and

theirs and base, which hasn’t been resolved yet.

• Mine: a conflict (or non-conflict difference) for which the choice has been made in favor of mine

• Base: conflict (or non-conflict difference) for which the choice has been made in favor of base

• Theirs: conflict (or non-conflict difference) for which the choice has been made in favor of theirs

Note

When Three-way Merge is launched, it auto-resolves all cases where only 2 of the 3 conditions for a conflict (listed above) are met. These differences are called “non-conflict differences”. In these cases, Three-way Merge resolves in favor of the item of the three which simultaneously differs from the other two. Users can modify the automatic resolution as they see fit.

Both the comparison tree and the merge output tree display each element requiring a resolution choice with a highlight indicating the currently-chosen resolution.