How to conclude your merge of a file?

user_256053 0
Viewed 184536

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?

merge git
5 Answers

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

user_2192170

I just did:

git merge --continue

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

user_103443140
Related