Login or Register to Ask a Question and Join Our Community

Linux and UNIX Man Pages

Linux & Unix Commands - Search Man Pages

git-merge-file(1) [linux man page]

GIT-MERGE-FILE(1)						    Git Manual							 GIT-MERGE-FILE(1)

NAME

       git-merge-file - Run a three-way file merge

SYNOPSIS

       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

       If 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-file>, lines from <other-file>, or lines from both
       respectively. The length of the conflict markers can be given with the --marker-size option.

       The exit value of this program is negative on error, and the number of conflicts otherwise. 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

       -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.upstream
	   combines 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) suite

Git 1.8.5.3							    01/14/2014							 GIT-MERGE-FILE(1)

Check Out this Related Man Page

MERGE(1)						      General Commands Manual							  MERGE(1)

NAME

       merge - three-way file merge

SYNOPSIS

       merge [ options ] file1 file2 file3

DESCRIPTION

       merge  incorporates all changes that lead from file2 to file3 into file1.  The result ordinarily goes into file1.  merge is useful for com-
       bining 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.

OPTIONS

       -A     Output conflicts using the -A style of diff3(1), if supported by diff3.  This merges all changes leading from file2  to  file3  into
	      file1, and generates the most verbose output.

       -E, -e These  options  specify conflict styles that generate less information than -A.  See diff3(1) for details.  The default is -E.  With
	      -e, merge does not warn about conflicts.

       -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, merge -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 file1.

       -q     Quiet; do not warn about conflicts.

       -V     Print version number.

DIAGNOSTICS

       Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.

IDENTIFICATION

       Author: Walter F. Tichy.
       Manual Page Revision: ; Release Date: .
       Copyright (C) 1982, 1988, 1989 Walter F. Tichy.
       Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.

SEE ALSO

       diff3(1), diff(1), rcsmerge(1), co(1).

BUGS

       It normally does not make sense to merge binary files as if they were text, but merge tries to do it anyway.

									GNU								  MERGE(1)
Man Page