🎙 Free live masterclass · Sun, 29 Nov, 7:00 pm IST · Java Full Stack roadmap Register free →
Skills101
← Quiz: Branching and Merging: all 10 questions

Quiz: Branching and Merging · Question 3 of 10

After fixing a conflicted file, what do you run?

After fixing a conflicted file, what do you run?

  1. A.git push --force
  2. B.git add <file> then git commit
  3. C.git reset --hard
  4. D.git branch -d
Answer & explanation

Correct answer: git add <file> then git commit

Staging the file marks the conflict as resolved.

Can you get the rest right without peeking?

Take the timed Quiz: Branching and Merging quiz free. Pass it to earn XP and count towards your certificate.

Start the quiz →