git lease, commit your changes or stash them before you can merge.冲突
git冲突lease, commit your changes or stash them before you can merge.有两种方式解决这种问题(像我这种菜鸟比较喜欢第二种解决方式,主要是不用想太多的原因):1 stash 方法git stashgit pullgit stash pop2.放弃本地修改,直接覆盖之git reset --hardgit pull...
原创
2020-09-04 16:30:48 ·
440 阅读 ·
0 评论