← Quiz: Resolving Merge Conflicts: all 15 questions
Quiz: Resolving Merge Conflicts · Question 2 of 15
Base has x = 1. Ours still has x = 1. Theirs has x = 2. What does the merge produce?
Base has x = 1. Ours still has x = 1. Theirs has x = 2. What does the merge produce?
- A.A conflict
- B.x = 2, automatically
- C.x = 1, automatically
- D.Both lines
Answer & explanation
Correct answer: x = 2, automatically
Only theirs changed that line, so Git takes their change without asking.
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 →