git rebase 基本流程与冲突处理 | Git

本章覆盖：`git rebase main`；identify commits to replay；apply commits；conflict；`git add`；`git rebase --continue`；`--skip`；`--abort`；test after rebase；force push may be needed only when remote branch history was rewritten。

本章知识点

  • git rebase main
  • identify commits to replay
  • apply commits
  • conflict
  • git add
  • git rebase --continue
  • --skip
  • --abort
  • test after rebase
  • force push may be needed only when remote branch history was rewritten