How to conclude your merge of a file?

Question

After I merged a file in Git I tried to pull the repository but error came up:

You have not concluded your merge. (MERGE_HEAD exists)

How does one conclude a merge?

Answer 1

Check status (git status) of your repository. Every unmerged file (after you resolve conficts by yourself) should be added (git add), and if there is no unmerged file you should git commit

Answer 2

See the example starting with "After a merge" in the EXAMPLES section of the git-commit documentation. It walks through adding each of the conflicting files to the index, then using commit to finish the unreconciled merge.

You can use git ls-files -u to see which files git is waiting for you to resolve.