Git 冲突:Your local changes would be overwritten by merge. Commit, stash or revert them to proceed....
版权声明:转载请注明原文地址和作者 https://blog.csdn.net/u014690396/article/details/25624637解决方案有三种:1,无视,直接commit自己的代码。git commit -m "your msg"2,stash stash翻译为“隐藏”,如下操作:git stashgit pullgit stash pop然后di...