第一种错误：
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.error: Your local changes to the fo
阅读背景：
代码冲突常见解决方法
来源：互联网
分享到：
