1. 使用git server 最新版覆盖本地的修改:
git fetch --all
git reset --hard origin/master
OR If you are on some other branch
git reset --hard origin/your_branch
http://stackoverflow.com/questions/1125968/force-git-to-overwrite-local-files-on-pull
git fetch --all
git reset --hard origin/master
OR If you are on some other branch
git reset --hard origin/your_branch
http://stackoverflow.com/questions/1125968/force-git-to-overwrite-local-files-on-pull