錯誤一

Updates were rejected because the remote contains work that you do

! [rejected] master -> master (fetch first) error: failed to push some refs to 'https://github.com/icessun/baiduWebShool.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

---

錯誤的原因是：遠程倉庫包含你本地所沒有的更新，可能是被其他人推送進去，故你應該合并這些變化在你準備推送之前

---

解決辦法：

$ git pull origin master 抓取遠端的內容 $ git push origin master 重新推送到遠程倉庫

---

錯誤二

Your local changes to the following files would be overwritten by checkout:

Administrator MINGW32 /d/blog (dev) $ git checkout master error: Your local changes to the following files would be overwritten by checkout:.idea/workspace.xml Please commit your changes or stash them before you switch branches. Aborting

---

錯誤的原因是：直接在遠程倉庫包操作了，修改了github上面的東西，相當于服務器上面的東西，而本地沒有修改，當想改變分支的時候，出現了改變分支的時候會重寫文件，所以必須把修改的提交到版本庫里面。或者是隱藏在你切換分支之前。

---

解決辦法：

• 拋棄本地的修改，回到上一個版本

  git reset --hard 然后，切換你的分支 git checkout master

轉載于:https://www.cnblogs.com/linewman/p/9918382.html

總結

以上是生活随笔為你收集整理的git学习小结（未完待续）的全部內容，希望文章能夠幫你解決所遇到的問題。

如果覺得生活随笔網站內容還不錯，歡迎將生活随笔推薦給好友。