git 上传至github出现error:your local changes to the following files would to be overwritten

本地代码与远程冲突

两种解决办法:

1,保留本地,并pull远程最新代码

git stash  
git pull origin master  
git stash pop

2,放弃本地修改,改为远程最新版本

git reset --hard  
git pull origin master