other versions
- jessie 1:2.1.4-2.1+deb8u6
- jessie-backports 1:2.11.0-3~bpo8+1
- stretch 1:2.11.0-3+deb9u4
- testing 1:2.20.1-2
- stretch-backports 1:2.20.1-1~bpo9+1
- unstable 1:2.20.1-2
- experimental 1:2.21.0+next.20190320-1
GIT-MERGE-FILE(1) | Git Manual | GIT-MERGE-FILE(1) |
NAME¶
git-merge-file - Run a three-way file mergeSYNOPSIS¶
git merge-file [-L <current-name> [-L <base-name> [-L <other-name>]]] [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>] [--[no-]diff3] <current-file> <base-file> <other-file>
DESCRIPTION¶
git merge-file incorporates all changes that lead from the <base-file> to <other-file> into <current-file>. The result ordinarily goes into <current-file>. git merge-file is useful for combining separate changes to an original. Suppose <base-file> is the original, and both <current-file> and <other-file> are modifications of <base-file>, then git merge-file combines both changes. A conflict occurs if both <current-file> and <other-file> 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 >>>>>>> B
OPTIONS¶
-L <label>This option may be given up to three times, and specifies
labels to be used in place of the corresponding file names in conflict
reports. That is, git merge-file -L x -L y -L z a b c generates output that
looks like it came from files x, y and z instead of from files a, b and
c.
-p
Send results to standard output instead of overwriting
<current-file>.
-q
Quiet; do not warn about conflicts.
--diff3
Show conflicts in "diff3" style.
--ours, --theirs, --union
Instead of leaving conflicts in the file, resolve
conflicts favouring our (or their or both) side of the lines.
EXAMPLES¶
git merge-file README.my README README.upstreamcombines the changes of README.my and README.upstream
since README, tries to merge them and writes the result into README.my.
git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345
merges tmp/a123 and tmp/c345 with the base tmp/b234, but
uses labels a and c instead of tmp/a123 and tmp/c345.
GIT¶
Part of the git(1) suite05/28/2018 | Git 2.1.4 |