🎙 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 8 of 15

During a rebase onto main, what does "theirs" refer to?

During a rebase onto main, what does "theirs" refer to?

  1. A.main
  2. B.Your own commit that is being replayed
  3. C.The remote repository
  4. D.The base commit
Answer & explanation

Correct answer: Your own commit that is being replayed

In a rebase, HEAD is the branch you rebase onto, so ours and theirs are the reverse of a merge.

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 →