← 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?
- A.git push --force
- B.git add <file> then git commit
- C.git reset --hard
- 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 →