摘要: 一、问题: 本地要commit代码,commit之前需pull代码,但pull提示冲突。如下 Git Pull Failed Your local changes would be overwritten by merge. Commit, stash or revert them to proceed. 二、分析: 原因很简单,代码冲突。解决也很简单,如图提示那样。Commit, ... 阅读全文
posted @ 2018-02-12 14:20 不无聊 阅读(5639) 评论(0) 推荐(0) 编辑