🎙 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 2 of 10

When does a merge conflict happen?

When does a merge conflict happen?

  1. A.When two branches have different names
  2. B.When both branches changed the same lines of the same file
  3. C.Every time you merge
  4. D.When you delete a branch
Answer & explanation

Correct answer: When both branches changed the same lines of the same file

Git can merge different areas automatically, but not the same lines.

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 →