I have merged a branch to master on GitHub and wanted to do a git pull locally after that. When I did a git pull it asked me to mit changes, so I have added files and mitted.
But something happened, and I am stuck kind of in the middle of the merge, although the merge is pleted. I have an empty staging and when I try to do a git pull I get this error:
❯ git pull
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, mit your changes before merging.
fatal: Exiting because of unfinished merge.
❯ git pull --force
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, mit your changes before merging.
fatal: Exiting because of unfinished merge.
and on the line where I write in the console by the branch name I have
master merge
Can someone tell me what is happening here and how to solve this problem? Thanks.
I have merged a branch to master on GitHub and wanted to do a git pull locally after that. When I did a git pull it asked me to mit changes, so I have added files and mitted.
But something happened, and I am stuck kind of in the middle of the merge, although the merge is pleted. I have an empty staging and when I try to do a git pull I get this error:
❯ git pull
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, mit your changes before merging.
fatal: Exiting because of unfinished merge.
❯ git pull --force
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, mit your changes before merging.
fatal: Exiting because of unfinished merge.
and on the line where I write in the console by the branch name I have
master merge
Can someone tell me what is happening here and how to solve this problem? Thanks.
Share Improve this question edited Mar 20, 2022 at 21:27 Christian 5,5414 gold badges29 silver badges44 bronze badges asked Mar 20, 2022 at 21:00 sevenseven 1,7043 gold badges23 silver badges53 bronze badges 1-
What is the output of
git status? – mkrieger1 Commented Mar 20, 2022 at 21:07
1 Answer
Reset to default 5Have you tried git merge --abort and tried to pull again?
From www.git-tower. about merge-conflicts:
You should always keep in mind that you can return to the state before you started the merge at any time. This should give you the confidence that you can't break anything. On the mand line, a simple
git merge --abortwill do this for you.
See also You have not concluded your merge (MERGE_HEAD exists)