error: failed to push some refs to錯(cuò)誤處理
最近在看爬蟲相關(guān)的書，想把其中一本的源碼放到github上方便管理。不過(guò)在操作的時(shí)候有些失誤：在github上創(chuàng)建庫(kù)的時(shí)候加上了readme.md選項(xiàng)，但是發(fā)現(xiàn)創(chuàng)建的本地庫(kù)里面也有一個(gè)readme.md文件，于是就把github 庫(kù)里的文件在頁(yè)面上刪除了。因?yàn)樯鲜鍪д`操作追城，在提交代碼到遠(yuǎn)程庫(kù)的時(shí)候報(bào)如下錯(cuò)：
george@GeorgeMBP ~/Developer/GitRepos/book-source-code/wswp master git push -u origin master
To https://github.com/zhiyanzhiyu/wswp.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/zhiyanzhiyu/wswp.git'
...
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
查了一下，說(shuō)可以先pull在push燥撞，但是試了一下pull的時(shí)候報(bào)錯(cuò)：
george@GeorgeMBP ~/Developer/GitRepos/book-source-code/wswp master git pull origin master
warning: no common commits
remote: Enumerating objects: 5, done.
...
fatal: refusing to merge unrelated histories
? george@GeorgeMBP ~/Developer/GitRepos/book-source-code/wswp
繼續(xù)查座柱，有同學(xué)說(shuō)可以通過(guò)命令git pull --rebase origin master進(jìn)行代碼合并，這樣pull的效果等同于fetch+merge物舒，試了一下色洞，果然可以！
george@GeorgeMBP ~/Developer/GitRepos/book-source-code/wswp master git pull --rebase origin master
From https://github.com/zhiyanzhiyu/wswp
* branch master -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: init submit
george@GeorgeMBP ~/Developer/GitRepos/book-source-code/wswp master
george@GeorgeMBP ~/Developer/GitRepos/book-source-code/wswp master git push -u origin master
Enumerating objects: 180, done.
...
Branch 'master' set up to track remote branch 'master' from 'origin'.
george@GeorgeMBP ~/Developer/GitRepos/book-source-code/wswp master
