← Quiz: Resolving Merge Conflicts: all 15 questions
Quiz: Resolving Merge Conflicts · Question 5 of 15
After editing a conflicted file into its final form during a merge, what tells Git it is resolved?
After editing a conflicted file into its final form during a merge, what tells Git it is resolved?
- A.Saving the file
- B.git add on that file
- C.git push
- D.git merge --continue-all
Answer & explanation
Correct answer: git add on that file
Staging the file marks it resolved; then git commit finishes the merge.
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 →