git merging problems while pulling

Question

i have these errors while pulling in Git

error: You have not concluded your merge (MERGE_HEAD exists). hint: Please, commit your changes before merging. fatal: Exiting because of unfinished merge.

amd my name in the git command line appears like that (master|MER GING)

Assuming you want to continue with the merge: Search your IDE for <<<< or >>>> and make sure all merge conflicts are resolved. Once your code looks correct, commit all files (`git add -A`), then commit (`git commit -m '[commit message here]'`). Then you should be good to proceed — Ally Ripp, Apr 30 '18 at 16:28
Possible duplicate of [You have not concluded your merge (MERGE\_HEAD exists)](https://stackoverflow.com/questions/11646107/you-have-not-concluded-your-merge-merge-head-exists) — phd, Apr 30 '18 at 17:45

score 8 · Accepted Answer · answered Apr 30 '18 at 16:36

8

Undo merge and pull again To undo:

git reset --merge

Then resolve the conflicts and make sure to add and commit the merge

answered Apr 30 '18 at 16:36

Mustahsan

3,370
1
11
27

what do you mean please by resolve the conflicts which command should i enter ? – CoderTn Apr 30 '18 at 16:43
This article might help you https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ – Mustahsan Apr 30 '18 at 16:54

git merging problems while pulling

1 Answers1