NAME
git-merge-file - Run a three-way file merge
SYNOPSIS
git merge-file\n [-L <current-name> [-L <base-name> [-L <other-name>]]]
\n
[--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]
\n
[--[no-]diff3] [--object-id] <current> <base> <other>DESCRIPTION
Given three files <current>, <base> and <other>, git merge-file incorporates all changes that lead from <base> to <other> into <current>. The result ordinarily goes into <current>. git merge-file is useful for combining separate changes to an original. Suppose <base> is the original, and both <current> and <other> are modifications of <base>, then git merge-file combines both changes.
A conflict occurs if both <current> and <other> have changes in a common segment of lines. If a conflict is found, git merge-file normally outputs a warning and brackets the conflict with lines containing <<<<<<< and >>>>>>> markers. A typical conflict will look like this:
<<<<<<< A
lines in file A
=======
lines in file B
>>>>>>> BIf there are conflicts, the user should edit the result and delete one of the alternatives. When --ours, --theirs, or --union option is in effect, however, these conflicts are resolved favouring lines from <current>, lines from <other>, or lines from both respectively. The length of the conflict markers can be given with the --marker-size option.
If --object-id is specified, exactly the same behavior occurs, except that instead of specifying what to merge as files, it is specified as a list of object IDs referring to blobs.
The exit value of this program is negative on error, and the number of conflicts otherwise (truncated to 127 if there are more than that many conflicts). If the merge was clean, the exit value is 0.
git merge-file is designed to be a minimal clone of RCS merge; that is, it implements all of RCS merge's functionality which is needed by git(1).
OPTIONS
--object-id
If the -p option is specified, the merged file (including conflicts, if any) goes to standard output as normal; otherwise, the merged file is written to the object store and the object ID of its blob is written to standard output.
-L <label>
-p
-q
--diff3
--zdiff3
--ours, --theirs, --union
--diff-algorithm={patience|minimal|histogram|myers}
EXAMPLES
git merge-file README.my README README.upstream
git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345
git merge-file -p --object-id abc1234 def567 890abcd
GIT
Part of the git(1) suite