git-merge-file

Three-way merge files

$ git merge-file [current] [base] [other]

$ git merge-file --diff3 [current] [base] [other]

$ git merge-file -p [current] [base] [other]

$ git merge-file -q [current] [base] [other]

git merge-file [options] current base other

git merge-file performs a three-way merge on individual files. Given the current version, common ancestor, and other version, it produces a merged result with conflict markers where automatic resolution is not possible.
The command operates on files outside of Git's normal merge workflow, making it useful for custom merge scenarios or merging files independently. The first file is modified in place with the merge result, and the exit code indicates whether conflicts occurred.

CURRENT

Current version file.

Common ancestor file.

Other version to merge.

Output to stdout.

Include base in conflicts.

Suppress warnings.

Resolve conflicts with ours.

Resolve conflicts with theirs.

Display help information.

Plumbing command. Modifies first file in place. Exit code indicates conflicts.

git merge-file is a core Git plumbing command implementing the three-way merge algorithm used internally by git merge.

git-merge(1), diff3(1)