🎙 Free live masterclass · Sun, 29 Nov, 7:00 pm IST · Java Full Stack roadmap Register free →
Skills101
← Quiz: Resolving Merge Conflicts: all 15 questions

Quiz: Resolving Merge Conflicts · Question 13 of 15

During a merge conflict you decide to keep the incoming branch's version of config.json. What do you run?

During a merge conflict you decide to keep the incoming branch's version of config.json. What do you run?

  1. A.git checkout --ours config.json
  2. B.git checkout --theirs config.json, then git add config.json
  3. C.git merge --abort
  4. D.git rm config.json
Answer & explanation

Correct answer: git checkout --theirs config.json, then git add config.json

Theirs is the branch being merged in; git add marks the file resolved.

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 →