← Quiz: Resolving Merge Conflicts: all 15 questions
Quiz: Resolving Merge Conflicts · Question 11 of 15
Base has price = 499. Both branches changed it to price = 549. What happens?
Base has price = 499. Both branches changed it to price = 549. What happens?
- A.A conflict
- B.No conflict; Git takes the identical change
- C.Git keeps 499
- D.The merge is aborted
Answer & explanation
Correct answer: No conflict; Git takes the identical change
Two identical changes agree, so there is nothing to decide.
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 →