Feature Branch + 冲突解决完整协作实验 | Git

本章覆盖：main；two feature branches；divergent changes；fetch；merge；content conflict；inspect ours / theirs / base；manual resolution；test；commit；graph visualization；explain why conflict happened。

本章知识点

  • main
  • two feature branches
  • divergent changes
  • fetch
  • merge
  • content conflict
  • inspect ours / theirs / base
  • manual resolution
  • test
  • commit
  • graph visualization
  • explain why conflict happened