6.多人协作
前面我们介绍过了Git
是分布式版本控制,即每个人的电脑上都有一个完整的版本库,而我们一般情况下会选择一台电脑充当中央服务器,防止什么同事没来啊 什么电脑死机等等问题。我们可以将提交推送到中央服务器,而其他人的修改我们可以从中央服务器更新获取。而世界上就有一个负责Git
托管的网站GItHub
首先注册GitHub
就不多说了,因为GitHub
是采用ssh
协议加密的。所以我们要进行一些设置
1.在用户主目录下看是否有ssh
目录,下面是否有id_rsa
和 id_rsa.pub
文件,有则跳过此步,没有进行创建
ssh-keygen -t rsa -C "youremail@example.com"
输入邮箱 一路回车即可。id_rsa
为私钥 id_rsa.pub
为公钥
2 打开GitHub
用户管理添加id_rsa.pub
内容
接下来说一下多人协作的内容。既然说到了多人协作,那么我们就要把自己的提交推送到GitHub
以及将他人的修改更新到本地版本库。一般情况下master
以及 大家工作的dev
分支一定要推送到GitHub
至于bug
feature
分支则视情况而定了
我们创建C:\testyz
以及 C:\testyz2
模拟两个用户
首先我们一般在GitHub
上创建项目库并导入本地。(GitHub
上面的操作一律不介绍了。。。。)
git clone git@github.com:RisingSunYZ/testXZ.git
我们首先将GitHub
上面的版本库克隆到C:\testyz
文件下,并在本地版本库中创建dev
分支 ,在分支下创建a.txt
文件,填写内容,并提交。然后将dev
分支合并到master
分支
C:\testyz\testXZ>git branch
* master
C:\testyz\testXZ>git checkout -b dev
Switched to a new branch 'dev'
C:\testyz\testXZ>git branch
* dev
master
C:\testyz\testXZ>git diff
diff --git a/a.txt b/a.txt
index e69de29..593fcc7 100644
--- a/a.txt
+++ b/a.txt
@@ -0,0 +1,2 @@
+testGitHub
+HelloGitHub
C:\testyz\testXZ>git add a.txt
C:\testyz\testXZ>git commit -m "first"
[dev c4a2490] first
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 a.txt
C:\testyz\testXZ>git status
On branch dev
nothing to commit, working tree clean
C:\testyz\testXZ>git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
C:\testyz\testXZ>git branch
dev
* master
C:\testyz\testXZ>git merge --no-f -m "second" dev
Merge made by the 'recursive' strategy.
a.txt | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 a.txt
C:\testyz\testXZ>git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
接下来将本地已经提交的分支推送至GitHub
C:\testyz\testXZ>git push origin master
Counting objects: 4, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (4/4), 331 bytes | 110.00 KiB/s, done.
Total 4 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), done.
To github.com:RisingSunYZ/testXZ.git
370fbab..5cdc210 master -> master
C:\testyz\testXZ>git push origin dev
Total 0 (delta 0), reused 0 (delta 0)
To github.com:RisingSunYZ/testXZ.git
* [new branch] dev -> dev
这边我们的创建文件以及两个分支上都已经提交并推送至GitHub
了
现在在另一个目录下模拟另一个小伙伴抓取分支
C:\testyz2>git clone git@github.com:RisingSunYZ/testXZ.git
Cloning into 'testXZ'...
remote: Counting objects: 7, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 7 (delta 1), reused 4 (delta 1), pack-reused 0
Receiving objects: 100% (7/7), done.
Resolving deltas: 100% (1/1), done.
默认情况下 我们只能看到master
分支
C:\testyz2\testXZ>git branch
* master
现在,你的小伙伴要在dev
分支上开发,就必须创建远程origin
的dev
分支到本地,于是他用这个命令创建本地dev
分支:
C:\testyz2\testXZ>git checkout -b dev origin/dev
Switched to a new branch 'dev'
Branch 'dev' set up to track remote branch 'dev' from 'origin'.
接下来我们在dev
分支上修改提交,我们接下来模拟一下冲突的情况,即在a.txt
相同位置修改并提交推送
C:\testyz2\testXZ>git add a.txt
C:\testyz2\testXZ>git commit -m "testdev2"
[dev 678a036] testdev2
1 file changed, 1 insertion(+)
C:\testyz2\testXZ>git push origin dev
To github.com:RisingSunYZ/testXZ.git
! [rejected] dev -> dev (fetch first)
error: failed to push some refs to 'git@github.com:RisingSunYZ/testXZ.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 pull
解决冲突
$ git pull
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 3 (delta 0)
Unpacking objects: 100% (3/3), done.
From github.com:michaelliao/learngit
fc38031..291bea8 dev -> origin/dev
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 dev origin/<branch>
git pull
也失败了,原因是没有指定本地dev
分支与远程origin/dev
分支的链接,根据提示,设置dev
和origin/dev
的链接:
$ git branch --set-upstream dev origin/dev
Branch dev set up to track remote branch dev from origin.
再pull
$ git pull
Auto-merging hello.py
CONFLICT (content): Merge conflict in hello.py
Automatic merge failed; fix conflicts and then commit the result.
接下来我们手动解决冲突并推送
<<<<<<< HEAD
lalalalalalalalal
=======
testGitHub
HelloGitHub
>>>>>>> 49dcd8f0f927e506d341380d71be71b0d5b25e07
因此,多人协作的工作模式通常是这样:
首先,可以试图用git push origin branch-name
推送自己的修改;
如果推送失败,则因为远程分支比你的本地更新,需要先用git pull
试图合并;
如果合并有冲突,则解决冲突,并在本地提交;
没有冲突或者解决掉冲突后,再用git push origin branch-name
推送就能成功!
如果git pull
提示“no tracking information”,则说明本地分支和远程分支的链接关系没有创建,用命令git branch --set-upstream 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
,如果有冲突,要先处理冲突。