Question 1 of 8
What remains after you edit a conflicted file but before staging it?
Editing changes the working tree; it does not by itself resolve the index.
Quiz
Git Merge Conflict Resolution Quiz
Check your understanding of resolving unmerged Git paths, staging the resolved index, and separating resolution from merge completion.
8 questions
Knowledge check
Git Merge Conflict Resolution Quiz
Check your understanding of resolving unmerged Git paths, staging the resolved index, and separating resolution from merge completion.
- Stuck? Each question has an optional hint.
- Skip a hard question and review it before your results.
- Questions and answer options can shuffle between attempts.
You can retake this quiz whenever you like.
0:00
Question 2 of 8
What does `git add conflict.txt` do during conflict resolution?
A successful add converts the path from an unmerged index state into a normal staged result.
Question 3 of 8
Which command directly checks for remaining unmerged index entries?
The unmerged query directly inspects the index representation.
Question 4 of 8
If two paths are conflicted, what happens when only one resolved path is staged?
Resolution is path-specific.
Question 5 of 8
What should `git diff --cached` show after resolving and staging a conflict?
The cached diff compares HEAD with the current index, showing what is staged.
Question 6 of 8
After all conflicts are resolved and staged, what can still be true?
Resolution and merge completion are distinct state transitions.
Question 7 of 8
Which statement about conflict resolution is most precise?
Git records the resolved content you place in the index; it does not require a universal side choice.
Question 8 of 8
What proves that resolution is complete for every conflicted path?
The unmerged-index query gives the direct repository-state evidence.
Quiz results
0/0
Review
-
What remains after you edit a conflicted file but before staging it?Hint used
-
What does `git add conflict.txt` do during conflict resolution?Hint used
-
Which command directly checks for remaining unmerged index entries?Hint used
-
If two paths are conflicted, what happens when only one resolved path is staged?Hint used
-
What should `git diff --cached` show after resolving and staging a conflict?Hint used
-
After all conflicts are resolved and staged, what can still be true?Hint used
-
Which statement about conflict resolution is most precise?Hint used
-
What proves that resolution is complete for every conflicted path?Hint used