Fast-forward Merge 与 Three-way Merge | Git

本章覆盖：fast-forward；divergent branches；merge base；three-way merge；merge result；merge commit；`--ff`；`--no-ff`；history topology；merge strategy 高层认知。

本章知识点

  • fast-forward
  • divergent branches
  • merge base
  • three-way merge
  • merge result
  • merge commit
  • --ff
  • --no-ff
  • history topology
  • merge strategy 高层认知