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.
1、保留本地的代码上的改动，仅仅并入新的配置项
1、git stash ---将本地的改动藏起来
2、git pull ---从仓库将代码拉取下来
3、git stash pop ----将藏起来的代码pop出来
4、git diff -w ---最好不用，IDEA上直接查看diff
2、将拉取的代码直接覆盖本地的代码
1、git reset --hard
2、git pull
