在发布这个配置文件的时候,会发生代码冲突:
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】git报错：git checkout xxx error: The following untracked working tree files would be overwritten b
- idea切换git分支时，提示：Your local changes to the following files would be overwritten by checkout.
- 解决“Your local changes to the following files would be overwritten by merge“
- Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.
- Your local changes to the following files would be overwritten by checkout
- git error: Your local changes to the following files would be overwritten by merge:xxxxxx ,Please commit your changes or stash them before you merge.的phpstorm解决办法
- git error: Your local changes to the following files would be overwritten by merge:xxxxxx ,Please commit your changes or stash them before you merge.的phpstorm解决办法
- Git出现error: Your local changes to the following files would be overwritten by merge: ... Please, commit your changes or stash them before you can merge.的问题解决（Git代码冲突）
- git更新代码报错，error: The following untracked working tree files would be overwritten by ch
- git 解决 Your local changes to the following files would be ov