What's the difference between 'git merge' and 'git rebase'?

最新推荐文章于 2025-08-14 15:29:14 发布

weixin_33918357

最新推荐文章于 2025-08-14 15:29:14 发布

阅读量150

点赞数

CC 4.0 BY-SA版权

文章标签： git

原文链接：https://my.oschina.net/mskk/blog/2253602

本文探讨了Git中解决冲突的两种主要方式：Merge和Rebase。通过具体示例，详细阐述了这两种操作如何避免历史混乱，保持历史记录的整洁直线。了解这些概念对于高效团队协作至关重要。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

为什么80%的码农都做不了架构师？>>>

Suppose originally there were 3 commits, A,B,C:

A-B-C

Then developer Dan created commit D, and developer Ed created commit E:

A-B-C-D-E

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

MERGE:

A-B-C-D-E-M

Both commits D and E are still here, but we create merge commit M that inherits changes from both D and E. However, this creates diamond shape, which many people find very confusing.

REBASE:

A-B-C-D-E-R

We create commit R, which actual file content is identical to that of merge commit M above. But, we get rid of commit E, like it never existed (denoted by dots - vanishing line). Because of this obliteration, 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!

转载于:https://my.oschina.net/mskk/blog/2253602