冲突预防与长期分支治理 | Git

本章覆盖:small commits;short-lived branches;frequent integration;modular code;avoid unrelated formatting;generated files;lockfile conflict;schema / migration conflict;ownership boundaries;communication;Git 只能帮助合并,不能替代团队协调。

本章知识点

  • small commits
  • short-lived branches
  • frequent integration
  • modular code
  • avoid unrelated formatting
  • generated files
  • lockfile conflict
  • schema / migration conflict
  • ownership boundaries
  • communication
  • Git 只能帮助合并,不能替代团队协调