廖雪峰Git教程笔记(十九)多人协作
2018-02-01 10:24
260 查看
当你从远程仓库克隆时,实际上Git自动把本地的master分支和远程的master分支对应起来了,并且,远程仓库的默认名称是origin。
要查看远程库的信息,用git remote,或者用git remove -v 显示更详细的信息:
$ git remote origin $ git remote -v origin https://github.com/182baobao/learngit_1_18.git (fetch) origin https://github.com/182baobao/learngit_1_18.git (push)
上面显示了可以抓取和推送的origin的地址。如果没有推送权限,就看不到push的地址。
推送分支
推送分支,就是把该分支上的所有本地提交推送到远程库。推送时,要指定本地分支,这样,Git就会把改分支推送到远程库对应的远程分支上
$ git push origin master Username for 'https://github.com':×××××××× Password for 'https://××××××××@github.com': Counting objects: 31, done. Delta compression using up to 4 threads. Compressing objects: 100% (29/29), done. Writing objects: 100% (31/31), 2.39 KiB | 1.19 MiB/s, done. Total 31 (delta 17), reused 0 (delta 0) remote: Resolving deltas: 100% (17/17), completed with 1 local object. To https://github.com/××××××××/learngit_1_18.git efdb1eb..6050685 master -> master
如果要推送其他分支,比如dev,就改成:
$ git push origin dev Username for 'https://github.com': ××××× Password for 'https://××××××××@github.com': Total 0 (delta 0), reused 0 (delta 0) To https://github.com/××××××××/learngit_1_18.git * [new branch] dev -> dev
我上github确实推送上去了。。可以看到。。。好神奇
但是,并不是一定要把本地分支往远程推送,那么,哪些分支需要推送,哪些不需要呢?
master分支是主分支,因此要时刻与远程同步;
dev分支是开发分支,团队所有成员都需要在上面工作,所以也需要与远程同步;
bug分支只用于在本地修复bug,就没必要推到远程了,除非老板要看看你每周到底修复了几个bug;
feature分支是否推到远程,取决于你是否和你的小伙伴合作在上面开发。
总之,就是在Git中,分支完全可以在本地自己藏着玩,是否推送,视你的心情而定!
抓取分支
多人协作时,大家都会往master和dev分支上推送各自的修改。
现在,模拟一个你的小伙伴,可以在另一台电脑(注意要把SSH Key添加到GitHub)或者同一台电脑的另一个目录下克隆(我就在自己电脑上clone啦):
$ git clone https://github.com/182baobao/learngit_1_18.git Cloning into 'learngit_1_18'... remote: Counting objects: 56, done. remote: Compressing objects: 100% (26/26), done. remote: Total 56 (delta 23), reused 56 (delta 23), pack-reused 0 Unpacking objects: 100% (56/56), done.
查看一下分支,只有一个
$ git branch * master
现在,你的小伙伴要在dev分支上开发,就必须创建远程origin的dev分支到本地,于是他用这个命令创建本地dev分支:
$ git checkout -b dev origin/dev
现在,他就可以在dev上继续修改,然后,时不时地把dev分支push到远程(我在readme的第一行加了一行):
$ git add readme $ git commit -m "add /usr/bin/env" [dev 9bf93b4] add /usr/bin/env 1 file changed, 1 insertion(+) $ git push origin dev Username for 'https://github.com': 182baobao Password for 'https://182baobao@github.com': Counting objects: 3, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 292 bytes | 292.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0) remote: Resolving deltas: 100% (2/2), completed with 2 local objects. To https://github.com/182baobao/learngit_1_18.git d38ddc6..9bf93b4 dev -> dev
你的小伙伴已经向origin/dev分支推送了他的提交,而碰巧你也对
ca31
同样的文件作了修改,并试图推送(我同样修改了readme):
$ git add readme $ git commit -m "add coding:utf-8" [dev 24b7f1e] add coding:utf-8 1 file changed, 1 insertion(+) t$ git push origin dev Username for 'https://github.com': 182baobao Password for 'https://182baobao@github.com': To https://github.com/182baobao/learngit_1_18.git ! [rejected] dev -> dev (fetch first) error: failed to push some refs to 'https://github.com/182baobao/learngit_1_18.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 remote: Counting objects: 3, done. remote: Compressing objects: 100% (1/1), done. remote: Total 3 (delta 2), reused 3 (delta 2), pack-reused 0 Unpacking objects: 100% (3/3), done. From https://github.com/182baobao/learngit_1_18 d38ddc6..9bf93b4 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-to=origin/<branch> dev
git pull也失败了,原因是没有指定本地dev分支与远程origin/dev分支的链接,根据提示,设置dev和origin/dev的链接(这里发现,如果按照教程走,会出错,原因可能是某些命令不在支持,如下):
$ git branch --set-upstream dev origin/dev fatal: the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.
按照提示,改为下面的句子
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 CONFLICT (content): Merge conflict in readme Automatic merge failed; fix conflicts and then commit the result.
这回git pull成功,但是合并有冲突,需要手动解决,解决的方法和分支管理中的解决冲突完全一样。解决后,提交,再push:
$ git add readme $ git commit -m "merge & fix readme" [dev f475696] merge & fix readme $ git push origin dev Username for 'https://github.com': 182baobao Password for 'https://182baobao@github.com': Counting objects: 6, done. Delta compression using up to 4 threads. Compressing objects: 100% (6/6), done. Writing objects: 100% (6/6), 572 bytes | 572.00 KiB/s, done. Total 6 (delta 4), reused 0 (delta 0) remote: Resolving deltas: 100% (4/4), completed with 2 local objects. To https://github.com/182baobao/learngit_1_18.git 9bf93b4..f475696 dev -> dev
就是这样,可以多人合作啦。。。BTY,这里git的提示确实好强大。。。
流程如下:
首先,可以试图git push origin branch-name 推送自己的修改;如果推送失败,则因为远程分支比你的本地的新,需要用git pull试图合并;
如果合并有冲突,则解决冲突,并在本地提交;
如果没有冲突,或者解决掉冲突,就用git push origin branch-name推送即可
如果git pull 提示“no tracking information”则说明本地分支和远程分支的链接关系没有创建,用命令git branch –set-upstream-to=origin/ dev即可
小结
查看远程库信息,使用 git remote -v;本地新建的分支如果不推送到远程,对其他人是不可见的;
从本地推送分支,使用git push origin branch-name,如果推送失败,用git pull抓取远程的新提交
在本地创建和远程分支对应的分支, 使用git checkout -b branch-name origin/branch-name,本地和远程分支的名称最好一样
建立本地分支和远程分支的关联,使用git branch –set-upstream-to=origin/ dev
从远程抓取分支,使用git pull,如果有冲突,要先处理冲突
相关文章推荐
- 廖雪峰Git教程笔记(八)撤销修改
- Git学习(廖雪峰的Git教程)笔记
- 廖雪峰Git教程笔记(三)安装Git
- Git学习(廖雪峰的Git教程)笔记2
- 廖雪峰Git教程笔记(十二)从远程库克隆
- 廖雪峰git教程学习笔记(一)
- 廖雪峰Git教程笔记(二十一)创建标签
- 廖雪峰Git教程学习笔记。持续更新中。。。
- 廖雪峰Git教程笔记(二)集中式和分布式版本控制系统
- 廖雪峰Git教程笔记(二十)标签管理
- 廖雪峰Git教程笔记(十六)分支管理策略
- 廖雪峰Git教程笔记(十一)添加远程库
- git笔记 (根据廖雪峰git教程整理)
- 廖雪峰Git教程笔记(四 )时光机穿梭
- 廖雪峰Git教程笔记(六)工作区和暂存区
- 廖雪峰Git教程笔记(二十二)操作标签
- 廖雪峰Git教程笔记(二十四)使用码云
- 廖雪峰Git教程笔记(七)管理修改
- 廖雪峰Git教程笔记(九)删除文件
- 廖雪峰Git教程笔记(十七)Bug分支