多人協(xié)作

多人協(xié)作時，大家都會往master和dev分支上推送各自的修改。

現(xiàn)在，模擬一個你的小伙伴，可以在另一臺電腦（注意要把SSH Key添加到GitHub）或者同一臺電腦的另一個目錄下克隆：

$ git clone git@github.com:michaelliao/learngit.git Cloning into 'learngit'... remote: Counting objects: 40, done. remote: Compressing objects: 100% (21/21), done. remote: Total 40 (delta 14), reused 40 (delta 14), pack-reused 0 Receiving objects: 100% (40/40), done. Resolving deltas: 100% (14/14), done.

當(dāng)你的小伙伴從遠(yuǎn)程庫clone時，默認(rèn)情況下，你的小伙伴只能看到本地的master分支。不信可以用git branch命令看看：

$ git branch * master

現(xiàn)在，你的小伙伴要在dev分支上開發(fā)，就必須創(chuàng)建遠(yuǎn)程origin的dev分支到本地，于是他用這個命令創(chuàng)建本地dev分支：

$ git checkout -b dev origin/dev

現(xiàn)在，他就可以在dev上繼續(xù)修改，然后，時不時地把dev分支push到遠(yuǎn)程：

$ git add env.txt$ git commit -m "add env" [dev 7a5e5dd] add env1 file changed, 1 insertion(+)create mode 100644 env.txt$ git push origin dev Counting objects: 3, done. Delta compression using up to 4 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 308 bytes | 308.00 KiB/s, done. Total 3 (delta 0), reused 0 (delta 0) To github.com:michaelliao/learngit.gitf52c633..7a5e5dd dev -> dev

推送失敗

你的小伙伴已經(jīng)向origin/dev分支推送了他的提交，而碰巧你也對同樣的文件作了修改，并試圖推送：

$ cat env.txt env$ git add env.txt$ git commit -m "add new env" [dev 7bd91f1] add new env1 file changed, 1 insertion(+)create mode 100644 env.txt$ git push origin dev To github.com:michaelliao/learngit.git! [rejected] dev -> dev (non-fast-forward) error: failed to push some refs to 'git@github.com:michaelliao/learngit.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.

推送失敗，則因?yàn)檫h(yuǎn)程分支比你的本地更新，解決辦法也很簡單，Git已經(jīng)提示我們，先用git pull把最新的提交從origin/dev抓下來，再推送：

$ 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> dev

拉取失敗

git pull也失敗了，原因是沒有指定本地dev分支與遠(yuǎn)程origin/dev分支的鏈接，根據(jù)提示，設(shè)置dev和origin/dev的鏈接：

$ git branch --set-upstream-to=origin/dev dev Branch 'dev' set up to track remote branch 'dev' from 'origin'.

再pull：

$ git pull Auto-merging env.txt CONFLICT (add/add): Merge conflict in env.txt Automatic merge failed; fix conflicts and then commit the result.

這回git pull成功，但是合并有沖突，需要手動解決，解決的方法和分支管理中的解決沖突完全一樣。解決后，提交，再push：

$ git commit -m "fix env conflict" [dev 57c53ab] fix env conflict$ git push origin dev Counting objects: 6, done. Delta compression using up to 4 threads. Compressing objects: 100% (4/4), done. Writing objects: 100% (6/6), 621 bytes | 621.00 KiB/s, done. Total 6 (delta 0), reused 0 (delta 0) To github.com:michaelliao/learngit.git7a5e5dd..57c53ab dev -> dev

多人協(xié)作的工作模式通常是這樣：

首先，可以試圖用git push origin <branch-name>推送自己的修改；

如果推送失敗，則因?yàn)檫h(yuǎn)程分支比你的本地更新，需要先用git pull試圖合并；

如果合并有沖突，則解決沖突，并在本地提交；

沒有沖突或者解決掉沖突后，再用git push origin <branch-name>推送就能成功！

　　如果git pull提示no tracking information，則說明本地分支和遠(yuǎn)程分支的鏈接關(guān)系沒有創(chuàng)建，用命令git branch --set-upstream-to <branch-name> origin/<branch-name>。

?

?

轉(zhuǎn)載于:https://www.cnblogs.com/kunmomo/p/11363356.html

總結(jié)

以上是生活随笔為你收集整理的Git复习（五）之多人协作、git push失败、git pull失败的全部內(nèi)容，希望文章能夠幫你解決所遇到的問題。

如果覺得生活随笔網(wǎng)站內(nèi)容還不錯，歡迎將生活随笔推薦給好友。