Resolving Conflicts During a Rebase — Roadmap Step & Resources
Handling conflicts that appear commit-by-commit while replaying history
- Level: intermediate
- Estimated time: 1 days
- Roadmap: Git & GitHub Fundamentals
Before this step
Study resources
- Git Branching - Rebasing (Article) — The Pro Git book's rebase chapter also covers resolving conflicts mid-rebase.
- Resolving Rebase Conflicts Explained (Video) — Covers handling conflicts that appear commit-by-commit during a rebase.
Part of
- Merge Conflicts & Rebasing — section
- Git & GitHub Fundamentals roadmap — the full learning path