← Quiz: Resolving Merge Conflicts: all 15 questions
Quiz: Resolving Merge Conflicts · Question 3 of 15
In the conflict markers, the text between <<<<<<< HEAD and ======= is:
In the conflict markers, the text between <<<<<<< HEAD and ======= is:
- A.The version from the branch you are on (ours)
- B.The version from the branch being merged in (theirs)
- C.The common ancestor
- D.A comment added by Git
Answer & explanation
Correct answer: The version from the branch you are on (ours)
HEAD is your current branch; the incoming branch's text comes after =======.
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 →