🎙 Free live masterclass · Sun, 29 Nov, 7:00 pm IST · Java Full Stack roadmap Register free →
Skills101
← Quiz: Branching and Merging: all 10 questions

Quiz: Branching and Merging · Question 8 of 10

In a conflicted file, what do the lines between <<<<<<< HEAD and ======= contain?

In a conflicted file, what do the lines between <<<<<<< HEAD and ======= contain?

  1. A.Your current branch's version
  2. B.The incoming branch's version
  3. C.The original version before both changes
  4. D.Git's suggested fix
Answer & explanation

Correct answer: Your current branch's version

The incoming version sits between ======= and >>>>>>>.

Can you get the rest right without peeking?

Take the timed Quiz: Branching and Merging quiz free. Pass it to earn XP and count towards your certificate.

Start the quiz →