git pull 提示错误,Your local changes to the following files would be overwritten by merge
程序员文章站
2022-07-13 21:10:23
...
error: Your local changes to the following files would be overwritten by merge:
Please commit your changes or stash them before you merge.
解决办法:
1、服务器代码合并本地代码
$ git stash //暂存当前正在进行的工作。
$ git pull origin master //拉取服务器的代码
$ git stash pop //合并暂存的代码
2、服务器代码覆盖本地代码
$git reset --hard //回滚到上一个版本
$git pull origin master
推荐阅读
-
Your local changes to the following files would be overwritten by merge:
-
git 出现 error: Your local changes to the following files would be overwritten by merge
-
git pull error: Your local changes to the following files would be overwritten by merge:
-
git merge 报错:error: Your local changes to the following files would be overwritten by m
-
git 删除本地修改 Your local changes to the following files would be overwritten by merge
-
git pull 提示错误,Your local changes to the following files would be overwritten by merge
-
git:error: Your local changes to the following files would be overwritten by merge:
-
Git出现冲突error: Your local changes to the following files would be overwritten by merge
-
git pull报错:error: Your local changes to the following files would be overwritten by merge:
-
git pull 提示错误,Your local changes to the following files would be overwritten by merge