How to conclude your merge of a file?

git, merge

Solution

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`

Problem

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?

Original source