记 git 遇到覆盖报错

Your local changes to the following files would be overwritten by merge ...

解决方案

git reset --hard
git pull

添加新评论