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)

<

Answer 1

Note and update:

Since Git1.7.4 (January 2011), you have git merge --abort, synonymous to "git reset --merge" when a merge is in progress.

But if you want to complete the merge, while somehow nothing remains to be added, then a crude rm -rf .git/MERGE* can be enough for Git to forget about the current merge.