Free Knowledge Resources


Linux Manual Pages


Free Software * Books

Source Code

Free Media

Linux

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 (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.

   --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



Opportunity


Personal Opportunity - Free software gives you access to billions of dollars of software at no cost. Use this software for your business, personal use or to develop a profitable skill. Access to source code provides access to a level of capabilities/information that companies protect though copyrights. Open source is a core component of the Internet and it is available to you. Leverage the billions of dollars in resources and capabilities to build a career, establish a business or change the world. The potential is endless for those who understand the opportunity.

Business Opportunity - Goldman Sachs, IBM and countless large corporations are leveraging open source to reduce costs, develop products and increase their bottom lines. Learn what these companies know about open source and how open source can give you the advantage.



Free Software


Free Software provides computer programs and capabilities at no cost but more importantly, it provides the freedom to run, edit, contribute to, and share the software. The importance of free software is a matter of access, not price. Software at no cost is a benefit but ownership rights to the software and source code is far more significant.

Free Office Software - The Libre Office suite provides top desktop productivity tools for free. This includes, a word processor, spreadsheet, presentation engine, drawing and flowcharting, database and math applications. Libre Office is available for Linux or Windows.



Free Books


The Free Books Library is a collection of thousands of the most popular public domain books in an online readable format. The collection includes great classical literature and more recent works where the U.S. copyright has expired. These books are yours to read and use without restrictions.

Source Code - Want to change a program or know how it works? Open Source provides the source code for its programs so that anyone can use, modify or learn how to write those programs themselves. Visit the GNU source code repositories to download the source.



Education


Study at Harvard, Stanford or MIT - Open edX provides free online courses from Harvard, MIT, Columbia, UC Berkeley and other top Universities. Hundreds of courses for almost all major subjects and course levels. Open edx also offers some paid courses and selected certifications.

Linux Manual Pages - A man or manual page is a form of software documentation found on Linux/Unix operating systems. Topics covered include computer programs (including library and system calls), formal standards and conventions, and even abstract concepts.


birds banner