git merge-one-file
Resolve a single file merge after a trivial merge. More information: https://git-scm.com/docs/git-merge-one-file.
- Resolve a simple merge conflict for a file:
git merge-one-file
- Use as a helper in merge-index for a file:
git merge-index git-merge-one-file
- Handle a binary file merge:
git merge-one-file -p
- Apply after read-tree in a scripted merge:
git read-tree -m && git merge-index git-merge-one-file
来源:tldr-pages contributors · 作者与贡献记录 · CC BY 4.0。离线整理了版式、链接和媒体显示。
