How to conclude your merge of a file?

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?

---

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

---

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.

---

The easiest solution I found for this:

git commit -m "fixing merge conflicts"
git push

---

I just did:

git merge --continue

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

---

If you encounter this error in SourceTree, go to Actions>Resolve Conflicts>Restart Merge.

SourceTree version used is 1.6.14.0