git pull 提示错误：Your local changes to the following files would be overwritten by merge

错误信息

error: Your local changes to the following files would be overwritten by merge:
       
Please commit your changes or stash them before you merge.

解决办法:

$ git stash     //暂存当前正在进行的工作。
$ git pull   origin master //拉取服务器的代码
$ git stash pop //合并暂存的代码

拓展:

提交代码:

$ git add .   //添加代码到本地

$ git commit -m"提交代码模块说明"   //提交代码到本地

$ git push   //推送代码的意思