I just merged two repositories, and I had to update probably 50+ files. To complete the merge I need to add back the updated files, I get this error:
error: merge is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.