1

I am new to Git, I reverted all of my files so I have no pending changes but when I tried PULL command it showed below errors in output :

git pull
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
git show HEAD:src/app/home/header.component.ts
git show HEAD:src/app/home/header.component.ts

Also I would be grateful, if you suggest some blogs that guide me improve my Git experience.

Vivek Puri
  • 43
  • 1
  • 7

5 Answers5

4

You have to commit. Like the log said.

If you were in merge state you have to finish the merge by commit before pull or push

Flavien Marianacci
  • 149
  • 8
2

Git thinks that you previously attempted a merge which was not complete. That would occur if you had merge conflicts while attempting a merge. At that point, Git would have been waiting for you to fix your merge conflicts and continue the merge.

Since that never happened, Git is warning you that you are already in the middle of a merge and won't start a new one. You either need to clean up your current merge or abort your current merge before you can pull.

Normal Workflow:

git merge sample-branch
-- oops, conflict
-- fix <conflicted file>
git add <conflicted file>
git commit

The git commit will finish the merge that was in a conflicted state.

If you found you were not sure about what you wanted to merge you can get back to your pre-merge state by running: git merge --abort

You will also be able to verify that you are in the middle of a merge by running a git status. You will see in the status a message about your current merge status.

Tom Aranda
  • 5,919
  • 11
  • 35
  • 51
ATrimeloni
  • 59
  • 1
  • 3
1

Also I would be grateful, if you suggest some blogs that guide me improve my Git experience.

The git TagInfo contains many links to good introductional git literature (especially this one).

Graham
  • 7,431
  • 18
  • 59
  • 84
kowsky
  • 12,647
  • 2
  • 28
  • 41
1

Also I would be grateful, if you suggest some blogs that guide me improve my Git experience.

GitHub and CodeTree created a free "Try Git" tutorial that may be helpful.

Nicole Zeckner
  • 53
  • 7
0

Sometime, it happens. You resolve the merging conflicts and but you find no file to stage. Again you pull, you will get same merging conflict. Then try these steps:

  1. git merge --abort that aborts the ongoing merging activity
  2. Resolve the conflict. As soon as you save the file, you will find the nothing is there to stage. Amazing! isn't it.
  3. Go to the same file and add some space or delete some unwanted code. That's it.
  4. Save this file.
  5. Commit it.
  6. Take a latest git pull before git push
  7. This time you will not receive any conflict message.
  8. Then git push your changes. That's it.
akgupta
  • 101
  • 1
  • 6