Go语言视频零基础入门到精通

admin

合并两个commit有两种方式：一种是 git merge ，而这一种在git pull命令中是默认的   另一种是 git rebase


git pull命令中
git pull <远程主机名> <远程分支名>:<本地分支名>
例如：git pull origin next:master
把远程origin分支next fetch回来并git merge
git pull --rebase <远程主机名> <远程分支名>:<本地分支名>

而如果使用rebase方式则
git pull --rebase origin next：master
这里建议还是先git fetch在做决定是git merge还是git rebase吧，如果只是git pull则默认为merge。


现在看看merge和rebase的区别：
引用一个文章：http://stackoverflow.com/questions/16666089/whats-the-difference-between-Git-merge-and-git-rebase



Suppose originally there were 3 commits,

1. A

复制代码

,

1. B

复制代码

,

1. C

复制代码

:

Then developer Dan created commit

1. D

复制代码

, and developer Ed created commit

1. E

复制代码

:

Obviously, this conflict should be resolved somehow. For this, there are 2 ways:
MERGE:

Both commits

1. D

复制代码

and

1. E

复制代码

are still here, but we create merge commit

1. M

复制代码

that inherits changes from both

1. D

复制代码

and

1. E

复制代码

. However, this creates diamond shape, which many people find very confusing.
REBASE:

We create commit

1. R

复制代码

, which actual file content is identical to that of merge commit

1. M

复制代码

above. But, we get rid of commit

1. E

复制代码

, like it never existed (denoted by dots - vanishing line). Because of this obliteration,

1. E

复制代码

should be local to developer Ed and should have never been pushed to any other repository. Advantage of rebase is that diamond shape is avoided, and history stays nice straight line - most developers love that!讲的真好，真棒，32个赞。
diamond 菱形
get rid of 删除
identical 相同的