Error encountered while git pull:

localhost:~ lipengfei$ git pull
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.

This error may be due to the previous pull down the code did not automatically merge git merge — abort fails, use the following method to solve the problem: save a copy of the local modification, pull the latest code from the online, cover the local code, and then recover the local modification

git fetch --all
git reset --hard origin/master
git pull

Similar Posts:

• Git Conflict Error: commit your changes or stash them before you can merge. [How to Solve]
• [Solved] Git conflict Error: commit your changes or stash them before you can merge
• Please, commit your changes or stash them before you can merge
• git:Pull is not possible because you have unmerged files [How to Solve]
• Git error: The following untracked working tree files would be overwritten by checkout
• Git pull Error: error: Your local changes to the following files would be overwritten by merge:
• [Solved] git pull Error: error: Your local changes to the following files would be overwritten by merge
• [Solved] Git pull fatal: refusing to merge unrelated histories
• A rejected – non fast forward error occurred in eclipse push