# git-merge-one-file - The standard helper program to use with git-merge-index - man(1) - [phpMan]

> **TLDR:** 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}}`

*Source: tldr-pages*

---

[_GIT-MERGE-ONE-FILE_(1)](https://www.chedong.com/phpMan.php/man/GIT-MERGE-ONE-FILE/1/markdown)                        Git Manual                        [_GIT-MERGE-ONE-FILE_(1)](https://www.chedong.com/phpMan.php/man/GIT-MERGE-ONE-FILE/1/markdown)

## 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)](https://www.chedong.com/phpMan.php/man/git/1/markdown) suite

Git 2.43.0                                   07/02/2025                        [_GIT-MERGE-ONE-FILE_(1)](https://www.chedong.com/phpMan.php/man/GIT-MERGE-ONE-FILE/1/markdown)