解决error: Your local changes to the following files would be overwritten by pull
以下方法是强制git pull的最有效方法：
git fetch origin master
git reset --hard origin/master本文参考案例：
https://itsyndicate.org/blog/how-to-use-git-force-pull-properly/
Your local changes to the following files would be overwritten by pull