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
posted @ 2012-11-20 16:47  Ray.floyd  阅读(542)  评论(0)  编辑  收藏  举报