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.