Search notes:
git merge-index
Run a
merge
for files needing merging.
See also
git commands
Index