我是靠谱客的博主 现代戒指,这篇文章主要介绍your local changes would be overwritten by merge. commit stash or revert them to proceed. view them,现在分享给大家,希望可以做个参考。
error log:
your local changes would be overwritten by merge. commit stash or revert them to proceed. view them
You can't merge with local modifications. Git protects you from losing potentially important changes. You have three options. One is to commit the change using
git commit -m "My message"
The second is to stash it. stashing acts as a stack, where you can push changes, and you pop them in reverse order.
To stash type:
git stash
Do the merge, and than pull the stash:
git stash pop
The third options is to discard the local changes using git reset --hard
.
http://stackoverflow.com/questions/15745045/how-do-i-resolve-git-saying-commit-your-changes-or-stash-them-before-you-can-me
最后
以上就是现代戒指最近收集整理的关于your local changes would be overwritten by merge. commit stash or revert them to proceed. view them的全部内容,更多相关your内容请搜索靠谱客的其他文章。
本图文内容来源于网友提供,作为学习参考使用,或来自网络收集整理,版权属于原作者所有。
发表评论 取消回复