Your local changes to the following files would be overwritten by mergeerror: Your local changes to the following files would be overwritten by merge: protected/config/main.phpPlease, commit your changes or stash them before you can merge.参考http://blog.csdn.net/z...【阅读全文】