我直接用git pull的时候遇到这个错误:
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
git pull然后就可以了