You are in the middle of a conflicted merge 解决方法
解决办法:
git reset --hard HEAD
git fetch origin
git reset --hard origin
git reset --hard HEAD
git fetch origin
git reset --hard origin
转载于:https://www.cnblogs.com/rayfloyd/archive/2012/11/20/2779301.html