多人协作
当你从远程仓库克隆时,实际上Git自动把本地的main分支和远程的main分支对应起来了,并且,远程仓库的默认名称是origin。
要查看远程库的信息,用git remote -v
:
$ git remote -v
origin https://github.com/Bo-Vane/gitskills.git (fetch)
origin https://github.com/Bo-Vane/gitskills.git (push)
上面显示了可以抓取和推送的origin的地址。如果没有推送权限,就看不到push的地址。
推送分支
推送分支,就是把该分支上的所有本地提交推送到远程库。推送时,要指定本地分支,这样,Git就会把该分支推送到远程库对应的远程分支上:
$ git push origin 分支名
-
main分支是主分支,因此要时刻与远程同步;
-
dev分支是开发分支,团队所有成员都需要在上面工作,所以也需要与远程同步;
-
bug分支只用于在本地修复bug,就没必要推到远程了,除非老板要看看你每周到底修复了几个bug;
-
feature分支是否推到远程,取决于你是否和你的小伙伴合作在上面开发。
抓取分支
现在,模拟一个你的小伙伴,可以在另一台电脑(注意要把SSH Key添加到GitHub)或者同一台电脑的另一个目录下克隆:
$ git clone https://github.com/Bo-Vane/gitskills.git
Cloning into 'gitskills'...
remote: Enumerating objects: 6, done.
remote: Counting objects: 100% (6/6), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 6 (delta 0), reused 3 (delta 0), pack-reused 0
Receiving objects: 100% (6/6), done.
当你的小伙伴从远程库clone时,默认情况下,你的小伙伴只能看到本地的main(master)分支。不信可以用git branch命令看看:
$ git branch
* main
现在,你的小伙伴要在dev分支上开发,就必须创建远程origin的dev分支到本地,于是他用这个命令创建本地dev分支:
$ git switch -c dev origin/dev
fatal: invalid reference: origin/dev
却出现了错误,这是因为远程仓库还没有dev分支,我没有push
push之后发现还是报错,那就必须先拉取:
$ git pull
remote: Enumerating objects: 28, done.
remote: Counting objects: 100% (28/28), done.
remote: Compressing objects: 100% (11/11), done.
remote: Total 26 (delta 7), reused 26 (delta 7), pack-reused 0
Unpacking objects: 100% (26/26), 2.07 KiB | 15.00 KiB/s, done.
From https://github.com/Bo-Vane/gitskills
* [new branch] dev -> origin/dev
Already up to date.
$ git switch -c dev origin/dev
Switched to a new branch 'dev'
Branch 'dev' set up to track remote branch 'dev' from 'origin'.
这样就成功了。
现在,他就可以在dev上继续修改,然后,时不时地把dev分支push到远程:
$ git add README.md
$ git commit README.md -m "my friend first commit"
[dev a13770f] my friend first commit
1 file changed, 2 insertions(+)
$ git push origin dev
小伙伴已经向origin/dev分支推送了他的提交,而碰巧你也对同样的文件作了修改,并试图推送:
$ git push origin dev
To https://github.com/Bo-Vane/gitskills.git
! [rejected] dev -> dev (fetch first)
error: failed to push some refs to 'https://github.com/Bo-Vane/gitskills.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已经提示我们,先用git pull把最新的提交从origin/dev抓下来,然后,在本地合并,解决冲突,再推送:
$ git pull
这里省略一些代码
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=origin/<branch> dev
根据提示,我们没有指定本地dev分支与远程origin/dev分支的链接,再根据提示,设置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 README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
pull成功,但是自动合并有冲突,需要手动解决,解决的方法和分支管理中的解决冲突完全一样。解决后,提交,再push:
$ git add README.md
$ git commit -m "my friend,conflict fixed"
[dev 939816f] my friend,conflict fixed
$ git push origin dev
Enumerating objects: 8, done.
Counting objects: 100% (8/8), done.
Delta compression using up to 8 threads
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 476 bytes | 476.00 KiB/s, done.
Total 4 (delta 1), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
To https://github.com/Bo-Vane/gitskills.git
a13770f..939816f dev -> dev
至此,冲突解决并push成功
因此,多人协作的工作模式通常是这样:
1.首先,可以试图用git push origin <branch-name>
推送自己的修改;
2.如果推送失败,则因为远程分支比你的本地更新,需要先用git pull试图合并;
3.如果合并有冲突,则解决冲突,并在本地提交;
4.没有冲突或者解决掉冲突后,再用git push origin <branch-name>
推送就能成功!
注意:如果git pull提示no tracking information
,则说明本地分支和远程分支的链接关系没有创建,用命令git branch --set-upstream-to <branch-name> origin/<branch-name>
。
总结:
-
查看远程库信息,使用
git remote -v
; -
本地新建的分支如果不推送到远程,对其他人就是不可见的;
-
从本地推送分支,使用
git push origin branch-name
,如果推送失败,先用git pull
抓取远程的新提交; -
在本地创建和远程分支对应的分支,使用
git checkout -b branch-name origin/branch-name
,本地和远程分支的名称最好一致; -
建立本地分支和远程分支的关联,使用
git branch --set-upstream branch-name origin/branch-name
; -
从远程抓取分支,使用
git pull
,如果有冲突,要先处理冲突。