Merge Conflicts & Rebasing — Git & GitHub Fundamentals Roadmap
Handling the moments when Git can't automatically reconcile two sets of changes
Steps in Merge Conflicts & Rebasing
- Understanding Merge Conflicts — intermediate · Why conflicts happen and how Git marks them in a file
- Resolving Conflicts Locally — intermediate · Reading conflict markers, choosing the right resolution and completing the merge
- Rebase vs Merge — intermediate · Two different ways to integrate changes, and how they affect the commit history
- Interactive Rebase (Squash, Reorder, Edit) — intermediate · Cleaning up commit history before sharing it: squashing, reordering and editing commits
- Cherry-Picking Commits — intermediate · Applying a specific commit from one branch onto another without merging everything
- Resolving Conflicts During a Rebase — intermediate · Handling conflicts that appear commit-by-commit while replaying history
Part of
- Git & GitHub Fundamentals roadmap — the full learning path