You have not concluded your merge (MERGE_HEAD exists)

854 Asked by alexGONZALEZ in Devops , Asked on Apr 2, 2021

I made a branch called 'f' and did a checkout to master. When I tried the git pull command I got this message:

You have not concluded your merge (MERGE_HEAD exists).

Please, commit your changes before you can merge.

When I try the git status, it gave me the following:

On branch master

# Your branch and 'origin/master' have diverged,

# and have 1 and 13 different commit(s) each, respectively.

# Changes to be committed:

.......

# Untracked files:

# (use "git add ..." to include in what will be committed)

# Coachbase/

# log/development.log.orig

# log/restclient.log.orig

what should I do?

Answered by alex Duncan

The main reason for this kind of error is your previous pull failed to merge_head exists and went to conflict state. And the conflict was not resolved before the next pull

To remove this you need to undo a merge and pull again

For that

git merge --abort 

git reset --merge

And then you can resolve merge_head exists.

You have not concluded your merge (MERGE_HEAD exists)

Your Answer