第一种错误:
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 stash git pull git stash pop
如果希望用代码库中的文件完全覆盖本地工作版本. 方法如下:
git reset --hard git pull