← All practice quizzes🎯 Today’s placement challenge — 10 questions, no login. Can you score 10/10?Take today’s challenge →
Quiz: Resolving Merge Conflicts
5 questions · new set on every retakeNo time limitPass: 60%+10 XP on first pass
Why merge conflicts happen, how Git decides with a three-way merge, how to read conflict markers (including the diff3 style), resolve them safely, abort, and handle conflicts during a rebase.
Log in to take the quiz
Free account · see your score, answers and explanations, earn XP