ruby_noobie ruby_noobie - 3 months ago 21
Git Question

Git merge, add all updated files

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.


I have resolved all of the conflicts in the code, is there a command that will add all updated files or do I have to go file by file and add it manually?

Answer

You have to do it in this order:

git add . git commit git merge

Comments