出现错误

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.

出现原因和解决办法

pull 的前提是要保证本地 clean 才行，因此可以先commit 或者stash，然后再执行 pull