merge
incorporates all changes that lead from
file2
to
file3
into
file1.
The result ordinarily goes into
file1.
merge
is useful for combining separate changes to an original. Suppose
file2
is the original, and both
file1
and
file3
are modifications of
file2.
Then
merge
combines both changes.
A conflict occurs if both
file1
and
file3
have changes in a common segment of lines.
If a conflict is found,
merge
normally outputs a warning and brackets the conflict with
<<<<<<<
and
>>>>>>>
lines.
A typical conflict will look like this:
-
<<<<<<< file A
lines in file A
=======
lines in file B
>>>>>>> file B
If there are conflicts, the user should edit the result and delete one of the
alternatives.