← 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?
- A.main
- B.Your own commit that is being replayed
- C.The remote repository
- 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 →