The Merge Tool identifies a line as a conflict between the derivatives based on the following rules:
If a line is an addition in more than one derivative, but is different between the derivatives.
If a line is a deletion in at least one derivative and is marked as a modification in at least one other derivative.
If a line is a modification in more than one derivative but is different between the derivatives.
The example below shows a modification conflict in the second row. This line has been modified differently in the two derivatives. The line has a background color of dark yellow, meaning that it is a modification. It also has a background pattern that indicates that it is a conflict. The second row of the target shows that nothing has yet been inserted for this line, and it has the comment <Conflict> against it.
Ancestor and derivatives with conflict unselected
Target file
In the next example below, the version of this line from the second derivative has been selected for inclusion in the target by right-clicking it. The "selected" line has changed color to bright yellow to indicate a selected modification. The background pattern has changed to indicate a resolved conflict. Line 2 of the target shows that the difference has been inserted from the second derivative and the comment <Conflict> no longer appears against that line.
Conflict selected from second derivative
Target file with selected modification inserted
Related Topics