man > git-merge-one-file(1)

Che Dong

Resolve a single file merge after a trivial merge.

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

GIT-MERGE-ONE-FILE(1)                        Git Manual                        GIT-MERGE-ONE-FILE(1)

NAME
       git-merge-one-file - The standard helper program to use with git-merge-index

SYNOPSIS
       git merge-one-file


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

GIT
       Part of the git(1) suite

Git 2.43.0                                   07/02/2025                        GIT-MERGE-ONE-FILE(1)

Generated by phpman v4.10.0-7-g98e9fd5 · Markdown · JSON · MCP Author: Che Dong Under GNU General Public License
2026-09-03 16:25 @216.73.216.51
CrawledBy Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)