Git 技术篇 - 同步代码到github失败,提示non-fast-forward、error: failed to push some refs to问题解决方法,git pull的用法
生活随笔
收集整理的這篇文章主要介紹了
Git 技术篇 - 同步代码到github失败,提示non-fast-forward、error: failed to push some refs to问题解决方法,git pull的用法
小編覺得挺不錯的,現在分享給大家,幫大家做個參考.
因為 github 上倉庫里刪過一些內容,導致本地的倉庫和 github 里的對不上了。
此時用 git push 操作就會報 non-fast-forward,error: failed to push some refs to 的錯誤,這也是 git 安全機制的一部分。
所以我們只需要進行下 git pull origin master 就行了,其中 origin 指的是倉庫源,master 指的是分支。
git pull origin master 就相當于:
執行過程中會彈出這樣一個編輯框,可以用來記錄此次調整的改動。
編輯方法如果不會可以看這篇文章:
Linux 技術篇-使用vim命令創建、編輯文件內容實例演示,linux修改文檔方法
都做完了,再進行 git add、git commit、git push 操作重新同步就可以了。
強制同步方法:
如果 git push 加個 -f 或 –force 參數可以強制進行同步。
下面是整個操作的完整過程:
小藍棗+Administrator@С???? MINGW64 /c/Py_jupyter (master) $ git push -u origin master To https://github.com/2418546511/Py_jyputer.git/! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://2418546511:xxx@github.com/2418546511/Py_jyputer.git/' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.小藍棗+Administrator@С???? MINGW64 /c/Py_jupyter (master) $ git pull origin master From https://github.com/2418546511/Py_jyputer* branch master -> FETCH_HEAD Removing Java_Project/untitled1/untitled1.iml Removing Java_Project/untitled1/.idea/modules.xml Removing Java_Project/untitled1/.idea/misc.xml Removing Java_Project/untitled1/.idea/libraries/workbench_workbenchLevel_1.xml Removing Java_Project/untitled1/.idea/libraries/polardb_jdbc18.xml Removing Java_Project/untitled1/.idea/.gitignore Removing Java_Project/test/test.iml Removing Java_Project/test/src/com/test/test/test.java Removing Java_Project/test/src/com/test/test/readExcel.java Removing Java_Project/test/src/com/test/test/SiKuliTest.java Removing Java_Project/test/src/com/test/test/ReadFile.java Removing Java_Project/test/src/com/test/test/ReadClipboard.java Removing Java_Project/test/out/production/test/com/test/test/readExcel.class Removing Java_Project/test/out/production/test/com/test/test/SiKuliTest.class Removing Java_Project/test/.idea/modules.xml Removing Java_Project/test/.idea/misc.xml Removing Java_Project/test/.idea/compiler.xml Removing Java_Project/test/.idea/.gitignore Adding Java_Project/dbmanage/src/com/dbmanage/db/config.txt Adding Java_Project/dbmanage/src/com/dbmanage/db/ReadFile.java Adding Java_Project/dbmanage/src/com/dbmanage/db/ReadClipboard.java Adding Java_Project/dbmanage/src/com/dbmanage/db/DBUpdate.java Adding Java_Project/dbmanage/src/com/dbmanage/db/DBQuery.java Adding Java_Project/dbmanage/src/com/dbmanage/db/DBMain.java Adding Java_Project/dbmanage/src/com/dbmanage/db/DBConn.java Adding Java_Project/dbmanage/src/META-INF/MANIFEST.MF Adding Java_Project/dbmanage/out/production/dbmanage/com/dbmanage/db/config.txt Adding Java_Project/dbmanage/out/production/dbmanage/com/dbmanage/db/ReadFile.class Adding Java_Project/dbmanage/out/production/dbmanage/com/dbmanage/db/ReadClipboard.class Adding Java_Project/dbmanage/out/production/dbmanage/com/dbmanage/db/ReadClipboard$Result.class Adding Java_Project/dbmanage/out/production/dbmanage/com/dbmanage/db/DBUpdate.class Adding Java_Project/dbmanage/out/production/dbmanage/com/dbmanage/db/DBQuery.class Adding Java_Project/dbmanage/out/production/dbmanage/com/dbmanage/db/DBMain.class Adding Java_Project/dbmanage/out/production/dbmanage/com/dbmanage/db/DBConn.class Adding Java_Project/dbmanage/out/production/dbmanage/META-INF/MANIFEST.MF Adding Java_Project/dbmanage/out/artifacts/dbmanage_jar/dbmanage.jar Adding Java_Project/dbmanage/dbmanage.iml Adding Java_Project/dbmanage/.idea/vcs.xml Adding Java_Project/dbmanage/.idea/uiDesigner.xml Adding Java_Project/dbmanage/.idea/modules.xml Adding Java_Project/dbmanage/.idea/misc.xml Adding Java_Project/dbmanage/.idea/compiler.xml Adding Java_Project/dbmanage/.idea/artifacts/dbmanage_jar.xml Adding Java_Project/dbmanage/.idea/.gitignore Removing Java_Project/databaseTool/databaseTool.iml Removing Java_Project/databaseTool/.idea/modules.xml Removing Java_Project/databaseTool/.idea/misc.xml Removing Java_Project/databaseTool/.idea/.gitignore Merge made by the 'recursive' strategy.Java_Project/databaseTool/.idea/.gitignore | 3 -Java_Project/databaseTool/.idea/misc.xml | 6 --Java_Project/databaseTool/.idea/modules.xml | 8 ---Java_Project/databaseTool/databaseTool.iml | 11 ---Java_Project/test/.idea/.gitignore | 3 -Java_Project/test/.idea/compiler.xml | 6 --Java_Project/test/.idea/misc.xml | 6 --Java_Project/test/.idea/modules.xml | 8 ---.../production/test/com/test/test/SiKuliTest.class | Bin 1234 -> 0 bytes.../production/test/com/test/test/readExcel.class | Bin 3730 -> 0 bytes.../test/src/com/test/test/ReadClipboard.java | 63 -----------------Java_Project/test/src/com/test/test/ReadFile.java | 38 -----------.../test/src/com/test/test/SiKuliTest.java | 26 -------Java_Project/test/src/com/test/test/readExcel.java | 76 ---------------------Java_Project/test/src/com/test/test/test.java | 35 ----------Java_Project/test/test.iml | 29 --------Java_Project/untitled1/.idea/.gitignore | 3 -.../untitled1/.idea/libraries/polardb_jdbc18.xml | 9 ---.../.idea/libraries/workbench_workbenchLevel_1.xml | 9 ---Java_Project/untitled1/.idea/misc.xml | 6 --Java_Project/untitled1/.idea/modules.xml | 8 ---Java_Project/untitled1/untitled1.iml | 13 ----22 files changed, 366 deletions(-)delete mode 100644 Java_Project/databaseTool/.idea/.gitignoredelete mode 100644 Java_Project/databaseTool/.idea/misc.xmldelete mode 100644 Java_Project/databaseTool/.idea/modules.xmldelete mode 100644 Java_Project/databaseTool/databaseTool.imldelete mode 100644 Java_Project/test/.idea/.gitignoredelete mode 100644 Java_Project/test/.idea/compiler.xmldelete mode 100644 Java_Project/test/.idea/misc.xmldelete mode 100644 Java_Project/test/.idea/modules.xmldelete mode 100644 Java_Project/test/out/production/test/com/test/test/SiKuliTest.classdelete mode 100644 Java_Project/test/out/production/test/com/test/test/readExcel.classdelete mode 100644 Java_Project/test/src/com/test/test/ReadClipboard.javadelete mode 100644 Java_Project/test/src/com/test/test/ReadFile.javadelete mode 100644 Java_Project/test/src/com/test/test/SiKuliTest.javadelete mode 100644 Java_Project/test/src/com/test/test/readExcel.javadelete mode 100644 Java_Project/test/src/com/test/test/test.javadelete mode 100644 Java_Project/test/test.imldelete mode 100644 Java_Project/untitled1/.idea/.gitignoredelete mode 100644 Java_Project/untitled1/.idea/libraries/polardb_jdbc18.xmldelete mode 100644 Java_Project/untitled1/.idea/libraries/workbench_workbenchLevel_1.xmldelete mode 100644 Java_Project/untitled1/.idea/misc.xmldelete mode 100644 Java_Project/untitled1/.idea/modules.xmldelete mode 100644 Java_Project/untitled1/untitled1.iml小藍棗+Administrator@С???? MINGW64 /c/Py_jupyter (master) $ git add Java_Project小藍棗+Administrator@С???? MINGW64 /c/Py_jupyter (master) $ git commit -m "update java project 6.30" [master 37e0f83] update java project 6.303 files changed, 324 insertions(+)create mode 100644 Java_Project/databaseTool/.idea/workspace.xmlcreate mode 100644 Java_Project/test/.idea/workspace.xmlcreate mode 100644 Java_Project/untitled1/.idea/workspace.xml小藍棗+Administrator@С???? MINGW64 /c/Py_jupyter (master) $ git push -u origin master Enumerating objects: 76, done. Counting objects: 100% (76/76), done. Delta compression using up to 16 threads Compressing objects: 100% (50/50), done. error: RPC failed; curl 55 SSL_write() returned SYSCALL, errno = 10053 fatal: the remote end hung up unexpectedly 88.00 KiB/s Writing objects: 100% (67/67), 21.22 MiB | 346.00 KiB/s, done. Total 67 (delta 9), reused 0 (delta 0) fatal: the remote end hung up unexpectedly Everything up-to-date喜歡的點個贊?吧!
《新程序員》:云原生和全面數字化實踐50位技術專家共同創作,文字、視頻、音頻交互閱讀總結
以上是生活随笔為你收集整理的Git 技术篇 - 同步代码到github失败,提示non-fast-forward、error: failed to push some refs to问题解决方法,git pull的用法的全部內容,希望文章能夠幫你解決所遇到的問題。
- 上一篇: JavaScript 技术篇 - js在
- 下一篇: Git 技术篇 - git remote