error: Your local changes to the following files would be overwritten by checkout:

Posted INnoVation-V2

tags:

篇首语：本文由小常识网(cha138.com)小编为大家整理，主要介绍了error: Your local changes to the following files would be overwritten by checkout:相关的知识，希望对你有一定的参考价值。

在发布这个配置文件的时候,会发生代码冲突:

error: Your local changes to the following files would be overwritten by merge:
        protected/config/main.php
Please, commit your changes or stash them before you can merge.

解决方法：

git reset --hard

 

以上是关于error: Your local changes to the following files would be overwritten by checkout:的主要内容，如果未能解决你的问题，请参考以下文章

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: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

error: Your local changes to the following files would be overwritten by checkout: