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

I just did:

git merge --continue

At which point vi launched to edit a merge comment. A quick :wq and the merge was done.