git-merge-one-file

Merge single file

$ git merge-one-file [base] [ours] [theirs] [path] [mode]

git merge-one-file base ours theirs path mode

git merge-one-file is a helper script for single-file merging, called by `git merge-index` to handle individual file conflicts using the standard three-way merge algorithm. It receives blob SHA-1 hashes for the base, ours, and theirs versions and performs the merge.
This command is part of Git's internal merge machinery and is not typically invoked directly by users. It exists to support custom merge workflows and to provide a reference implementation for per-file merge programs.

BASE

Base version blob SHA.

Our version blob SHA.

Their version blob SHA.

File path.

File mode.

Display help information.

Plumbing command. Called by git merge internals. Not typically used directly.

git merge-one-file is part of Git's merge infrastructure, implementing per-file merge as a component of the overall merge process.

git-merge(1), git-merge-file(1)