Resolving Conflicts Locally — Roadmap Step & Resources
Reading conflict markers, choosing the right resolution and completing the merge
- Level: intermediate
- Estimated time: 1 days
- Roadmap: Git & GitHub Fundamentals
Before this step
Mini projects
- Deliberately create a merge conflict between two branches and resolve it cleanly
Study resources
- Oh Shit, Git!?! (Article) — A hugely popular, plain-language guide to fixing common Git mistakes including conflicts.
- How to Resolve Merge Conflicts Explained (Video) — A practical walkthrough of reading conflict markers and resolving them.
Part of
- Merge Conflicts & Rebasing — section
- Git & GitHub Fundamentals roadmap — the full learning path