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 reset针对版本)
git pull
时间: 2024-10-08 09:03:51