Error pulling origin: error: Your local changes to the following files would be overwritten by merge

在Android Studio使用git进行pull操作中,你会发现会有这么一个错误,这个其实类似于svn中的冲突。那如果解决这个问题呢,如图所示。

先stash changes,隐藏本地的改变,执行完这步后,再进行pull,pull完了一定不要忘记unstash changes,恢复你刚隐藏的改变。

Error pulling origin: error: Your local changes to the following files would be overwritten by merge

Error pulling origin: error: Your local changes to the following files would be overwritten by merge,布布扣,bubuko.com

Error pulling origin: error: Your local changes to the following files would be overwritten by merge

上一篇:(转)function($){}(window.jQuery) 是什么意思?


下一篇:制作WIN7+XP+DOS+PE多系统启动光盘