🎙 Free live masterclass · Sun, 29 Nov, 7:00 pm IST · Java Full Stack roadmap Register free →
Skills101
← Quiz: Resolving Merge Conflicts: all 15 questions

Quiz: Resolving Merge Conflicts · Question 1 of 15

What are the three versions Git compares in a three-way merge?

What are the three versions Git compares in a three-way merge?

  1. A.The first commit, the last commit and HEAD
  2. B.The common ancestor (base), ours and theirs
  3. C.The working directory, the staging area and the remote
  4. D.main, develop and feature
Answer & explanation

Correct answer: The common ancestor (base), ours and theirs

The base tells Git what each side changed; only overlapping different changes become conflicts.

Can you get the rest right without peeking?

Take the timed Quiz: Resolving Merge Conflicts quiz free. Pass it to earn XP and count towards your certificate.

Start the quiz →