index command: $ git merge-index git-merge-one-file hello Auto-merging hello ERROR: Merge
NAME MERGE - conditionally