Git 错误操作提示

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:
	app/Http/Controllers/Admin/SystemController.php
	app/Http/Middleware/NoLogin.php
	routes/web.php
Please, commit your changes or stash them before you can merge.
Aborting

解决办法

第一种

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

第二种

git reset --hard  //回滚到上一个版本
git pull origin master