Git, AI Tools & Your Career / Git and GitHub
Lesson 6 of 32
Merge conflicts
A conflict happens when two branches change the same lines. Git marks both versions in the file; you choose what to keep, then commit.
Key points
- Look for <<<<<<< and >>>>>>>
- Keep the right lines, delete the markers
- Commit the fix
Quiz · +10 XP
What causes a merge conflict?
Log in to save progress and earn XP.