git-merge-one-file - Man Page

• Resolve a simple merge conflict for a file: git merge-one-file path/to/file
• Use as a helper in merge-index for a file: git merge-index git-merge-one-file path/to/file
• Handle a binary file merge: git merge-one-file -p path/to/file
• Apply after read-tree in a scripted merge: git read-tree -m branch1 branch2 && git merge-index git-merge-one-file path/to/file

tldr.sh

git merge-one-file

This is the standard helper program to use with git merge-index to resolve a merge after the trivial merge done with git read-tree -m​.

Part of the git(1) suite