一、问题:
本地要commit代码,commit之前需pull代码,但pull提示冲突。如下
Git Pull Failed Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.
二、分析:
原因很简单,代码冲突。解决也很简单,如图提示那样。Commit, stash or revert 。
revert 就算了,Commit需要先Pull,肯定失败,只剩下stash。但是怎么stash呢?