前言
解决git代码提交冲突 更新代码的时候显示
error: Your local changes to the following files would be overwritten by merge:
mine/bp-csdn-PK-dev1.py
Please commit your changes or stash them before you merge.
Aborting
保留并引入
只引入新的配置
git stash
git pull
git stash pop
完全覆盖
git reset --hard
git pull
