CmdID

CmdID / Commands

git-merge-one-file

Resolve a single file merge after a trivial merge. tldr-pages

On several platforms

Opens CmdID with your command. It is read in your browser and sent nowhere.

Several platforms

from tldr-pages, CC BY 4.0

Resolve a simple merge conflict for a file

git merge-one-file path/to/fileIdentify

Use as a helper in merge-index for a file

git merge-index git-merge-one-file path/to/fileIdentify

Handle a binary file merge

git merge-one-file -p path/to/fileIdentify

Apply after read-tree in a scripted merge

git read-tree -m branch1 branch2 && git merge-index git-merge-one-file path/to/fileIdentify