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