manual merge/fixup question

git resolve or git merge fails, complaining
about file(s) having conflicts. I go ahead and fix up
those files and then update the index.

Can I assume now that I can go ahead and do git commit,
or is there any more/other files which need fixing?

I.e. does git resolve/merge fail on the first file
which needs fixing or would it go through all of them,
and then report the ones which need fixing?

Thanks,
   Luben