git pull error: Your local changes to the following files 解决方案
2014-10-15 21:26
399 查看
今天在服务器上git pull是出现以下错误:
处理方法如下:
如果希望保留生产服务器上所做的改动,仅仅并入新配置项:
git stash
git pull
git stash pop
然后可以使用git diff -w +文件名 来确认代码自动合并的情况.
如果希望用代码库中的文件完全覆盖本地工作版本. 方法如下:
git reset --hard
git pull
我的这是保留生产服务器上所做的改动,截图如下
处理方法如下:
如果希望保留生产服务器上所做的改动,仅仅并入新配置项:
git stash
git pull
git stash pop
然后可以使用git diff -w +文件名 来确认代码自动合并的情况.
如果希望用代码库中的文件完全覆盖本地工作版本. 方法如下:
git reset --hard
git pull
我的这是保留生产服务器上所做的改动,截图如下
相关文章推荐
- git pull 时出现 error: Your local changes to the following files would be overwritten by merge的解决办法
- git在pull时 Error pulling origin: 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......
- git pull遇到错误: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遇到错误 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遇到错误: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 时出现 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 报 error: Your local changes to the following files would be overwritten by merge: xxx.java
- PULL代码时遇到冲突怎么办 error:Your local changes to the following files would be overriten 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: ... Please, commit your changes or stash them before you can merge.的问题解决(Git代码冲突)
- 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提示 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错误error: Your local changes to the following files would be overwritten