🎙 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 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?

  1. A.Saving the file
  2. B.git add on that file
  3. C.git push
  4. 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 →