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

The easiest solution I found for this:

git commit -m "fixing merge conflicts"
git push