When there are conflicts in the merge, does git merge the rest of the files with no conflicts? For example, there are 10 different files to be merged, 5 files merge successfully and the 6th fails. Do the remaining 4 files merge as well?
I'm asking because a merge failed, I resolved the conflicts, committed the resolve and then noticed one file wasn't changed on the master branch. It stayed the way it was before the merge. I imagine git does merge all the other files and only tells me which had conflicts but I haven't found anything that mentions this explicitly and I don't want to make any assumptions.
Is there something extra I'm not doing after the merge fails? Does resolving the conflicts and committing fix everything or do I have to try the merge again afterwards?
Yes, git automatically merges the files it can, while pointing out the conflicts in the files which have them asking you to manually resolve them.