git pull 报错 error: Your local changes to the following files would be overwritten by merge

更新本地分支的时候，提示让先merge

可以忽略本地改动直接覆盖：

git reset --hard
git pull