服务器上:
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
解决办法:
1、服务器代码合并本地代码
$ git stash //暂存当前正在进行的工作。
$ git pull origin master //拉取服务器的代码
$ git stash pop //合并暂存的代码
2、服务器代码覆盖本地代码
$git reset --hard //回滚到上一个版本
$git pull origin master