【Git报错】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.phpPlease, commit you...
转载
2018-09-02 23:38:41 ·
1818 阅读 ·
0 评论