February 14, 2008

git pull出fatal: Entry ... not update, cannot merge的解决

先git diff xxx看是不是自己改了什么东西
如果改不回来可以用git reset --hard重置来解决这个问题

Posted by hufey at February 14, 2008 01:41 PM
Comments