git-merge-file
Three-way file merging
TLDR
Three-way merge files
$ git merge-file [current] [base] [other]
Merge with diff3 style$ git merge-file --diff3 [current] [base] [other]
Output to stdout$ git merge-file -p [current] [base] [other]
Quiet mode$ git merge-file -q [current] [base] [other]
SYNOPSIS
git merge-file [options] current base other
DESCRIPTION
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.
PARAMETERS
CURRENT
Current version file.BASE
Common ancestor file.OTHER
Other version to merge.-p, --stdout
Output to stdout.--diff3
Include base in conflicts.-q, --quiet
Suppress warnings.--ours
Resolve conflicts in favor of the "current" version.--theirs
Resolve conflicts in favor of the "other" version.--union
Take both sides of each conflict (append rather than mark).-L label
Provide a label for a file (pass up to three times for current/base/other).--help
Display help information.
INSTALL
sudo apt install git
sudo dnf install git
sudo pacman -S git
sudo apk add git
sudo zypper install git
brew install git
nix profile install nixpkgs#git
CAVEATS
Plumbing command. Modifies first file in place. Exit code indicates conflicts.
HISTORY
git merge-file is a core Git plumbing command implementing the three-way merge algorithm used internally by git merge.
