今天pull远程代码时，遇到这个问题。大概意思是本地的修改会被覆盖，要么提交，要么隐藏修改，要么回退。
选择stash，会将修改先隐藏，然后发现本地代码变成隐藏之前的了。然后再pull。最后在unstash，将修改合并。
选择revert，则将修改放弃，然拉取远程。
免责声明！
本站转载的文章为个人学习借鉴使用，本站对版权不负任何法律责任。如果侵犯了您的隐私权益，请联系本站邮箱yoyou2525@163.com删除。
猜您在找
Git Pull Failed ：Your local changes would be overwritten by merge. Commit, stash or revert them
Git 冲突：Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.
your local changes would be overwritten by merge. commit stash or revert them to proceed. view them
Your local changes would be overwritten by merge. Commit, stash or revert them to proceed的解决方法
Your local changes would be overwritten by merge. Commit, stash or revert them to proceed的解决方法
ideaGit使用问题Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.
Your local changes would be overwritten by merge. Commit, stash or revert th
git error: Your local changes to the following files would be overwritten by merge: Please commit your changes or stash them before you merge.解决办法
git error: Your local changes to the following files would be overwritten by merge:xxxxxx ,Please commit your changes or stash them before you merge.的phpstorm解决办法
Git出现error: Your local changes to the following files would be overwritten by merge: ... Please, commit your changes or stash them before you can merge.的问题解决（Git代码冲突）