GIT−MERGE−FILE - Online Linux Manual PageSection : 1
Updated : 2023−03−13
Source : Git 2.40.0
Note : Git Manual
NAMEgit-merge-file − Run a three−way file merge
SYNOPSISgit 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>
DESCRIPTIONgit 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
>>>>>>> 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−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 (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−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. −−zdiff3 Show conflicts in "zdiff3" style. −−ours, −−theirs, −−union Instead of leaving conflicts in the file, resolve conflicts favouring our (or their or both) side of the lines.
EXAMPLESgit 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.
GITPart of the git(1) suite 0
Johanes Gumabo
Data Size : 13,486 byte
man-git-merge-file.1Build : 2024-12-29, 07:25 :
Visitor Screen : x
Visitor Counter ( page / site ) : 2 / 259,496
Visitor ID : :
Visitor IP : 18.117.192.205 :
Visitor Provider : AMAZON-02 :
Provider Position ( lat x lon ) : 39.962500 x -83.006100 : x
Provider Accuracy Radius ( km ) : 1000 :
Provider City : Columbus :
Provider Province : Ohio , : ,
Provider Country : United States :
Provider Continent : North America :
Visitor Recorder : Version :
Visitor Recorder : Library :
Online Linux Manual Page : Version : Online Linux Manual Page - Fedora.40 - march=x86-64 - mtune=generic - 24.12.29
Online Linux Manual Page : Library : lib_c - 24.10.03 - march=x86-64 - mtune=generic - Fedora.40
Online Linux Manual Page : Library : lib_m - 24.10.03 - march=x86-64 - mtune=generic - Fedora.40
Data Base : Version : Online Linux Manual Page Database - 24.04.13 - march=x86-64 - mtune=generic - fedora-38
Data Base : Library : lib_c - 23.02.07 - march=x86-64 - mtune=generic - fedora.36
Very long time ago, I have the best tutor, Wenzel Svojanovsky . If someone knows the email address of Wenzel Svojanovsky , please send an email to johanes_gumabo@yahoo.co.id .
If error, please print screen and send to johanes_gumabo@yahoo.co.id
Under development. Support me via PayPal.