今天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代碼沖突）