git pull error:You are in the middle of a conflicted merge

You are in the middle of a conflicted merge 解决方法

解决办法:
git reset --hard HEAD
git fetch origin
git reset --hard origin
原文地址:https://www.cnblogs.com/rayfloyd/p/2779301.html