← 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?
- A.git checkout --ours config.json
- B.git checkout --theirs config.json, then git add config.json
- C.git merge --abort
- 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 →