2019獨角獸企業重金招聘Python工程師標準>>>

情景，本地git與遠程Git倉庫同步

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit $ git init Initialized empty Git repository in D:/workspace/learngit/.git/Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ git remote add origin git@github.com:ZhuBaker/learngit.gitAdministrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ git push -u origin master error: src refspec master does not match any. error: failed to push some refs to 'git@github.com:ZhuBaker/learngit.git'

原因分析

引起該錯誤的原因是，目錄中沒有文件，空目錄是不能提交上去的

解決方法

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ touch READMYFILE Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ git add READMYFILEAdministrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ git commit -m 'add READMYFILE' [master (root-commit) 28ed8af] add READMYFILE1 file changed, 0 insertions(+), 0 deletions(-)create mode 100644 READMYFILEAdministrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ git push -u origin master To github.com:ZhuBaker/learngit.git! [rejected] master -> master (fetch first) error: failed to push some refs to 'git@github.com:ZhuBaker/learngit.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.

提示首先要fetch 代碼? 或者 git pull

或者是強推? git push -f

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ git pull origin master From github.com:ZhuBaker/learngit* branch master -> FETCH_HEAD fatal: refusing to merge unrelated histories

提示拒絕merge兩個不相關的git

因為他們是兩個不同的項目，要把兩個不同的項目合并，git需要添加一句代碼，在git pull，這句代碼是在git 2.9.2版本發生的，最新的版本需要添加--allow-unrelated-histories

假如我們的源是origin，分支是master，那么我們 需要這樣寫git pull origin master --allow-unrelated-histories需要知道，我們的源可以是本地的路徑

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ git pull origin master --allow-unrelated-histories From github.com:ZhuBaker/learngit* branch master -> FETCH_HEAD Merge made by the 'recursive' strategy.abc.txt | 0dd | 1 +ddd.txt | 03 files changed, 1 insertion(+)create mode 100644 abc.txtcreate mode 100644 ddcreate mode 100644 ddd.txt Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ ls abc.txt dd ddd.txt READMYFILE Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ git pull There is no tracking information for the current branch. Please specify which branch you want to merge with. See git-pull(1) for details.git pull <remote> <branch>If you wish to set tracking information for this branch you can do so with:git branch --set-upstream-to=origin/<branch> master

直接使用git pull 命令會提示該提示：

讓我們使用 git pull 或者 建立本地分支與遠程分支的關聯才能使用

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ git branch --set-upstream-to=origin/master master Branch master set up to track remote branch master from origin.Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ git pull Already up-to-date.Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit (master) $ git push Counting objects: 4, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (4/4), 465 bytes | 0 bytes/s, done. Total 4 (delta 1), reused 0 (delta 0) remote: Resolving deltas: 100% (1/1), completed with 1 local object. To github.com:ZhuBaker/learngit.git6af3724..c01f0f2 master -> master

?

?

?

?

轉載于:https://my.oschina.net/LucasZhu/blog/1550827

總結

以上是生活随笔為你收集整理的本地Git关联远程Git时遇到的一些问题的全部內容，希望文章能夠幫你解決所遇到的問題。

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