Merge Base 与共同祖先 | Git

本章覆盖:common ancestor;merge base;three-way merge;`git merge-base`;branch divergence;diff against merge base;code review change range;rebase starting point;fork point 高层认知;理解 merge base 才能真正理解三方合并。

本章知识点

  • common ancestor
  • merge base
  • three-way merge
  • git merge-base
  • branch divergence
  • diff against merge base
  • code review change range
  • rebase starting point
  • fork point 高层认知
  • 理解 merge base 才能真正理解三方合并