在发布这个配置文件的时候,会发生代码冲突:
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:
原文：http://www.cnblogs.com/INnoVationv2/p/6091713.html