Git Pull Failed Your local changes would be overwritten by merge. Commit, stash or revert them

Failed Your local changes would be overwritten by merge. Commit, stash or revert them"/>

Git Pull Failed Your local changes would be overwritten by merge. Commit, stash or revert them

解决问题策略:该报错的意思是新修改的代码的文件，将会被git服务器上的代码覆盖；我当然不想刚刚写的代码被覆盖掉，三行代码解决该问题：
一、如果你想保留刚才本地修改的代码，并把git服务器上的代码pull到本地（本地刚才修改的代码将会被暂时封存起来）

git stash
git pull origin master
git stash pop

二、当然，如果你想完全覆盖新修改的代码，可以使用如下策略：

git reset 
git pull origin master