CODEWITHSUNDEEP
gitmergepull
CoderTn
CoderTn

Reputation: 997

git merging problems while pulling

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)

Upvotes: 2

Views: 17616

Answers (1)

Mustahsan
Mustahsan

Reputation: 3862

Undo merge and pull again To undo:

git reset --merge

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

Upvotes: 12

Related Questions