Question 1 of 8
What does a conflicting merge leave behind?
A conflicting merge leaves the repository in an unresolved merge state with unmerged paths.
Quiz
Git Merge Conflicts Quiz
Check whether you can identify and inspect Git’s unresolved merge state from real repository evidence.
8 questions
Knowledge check
Git Merge Conflicts Quiz
Check whether you can identify and inspect Git’s unresolved merge state from real repository evidence.
- 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
Why is a non-zero merge exit status not the whole state description?
The exit code reports command failure, while repository inspection reveals the merge state left behind.
Question 3 of 8
What does `git status --short` commonly report for a two-sided content conflict?
`UU` is the short-status form for an unmerged content conflict on the path.
Question 4 of 8
What do index stages 1, 2, and 3 represent for an unmerged path?
Git documents stage 1 as the common ancestor, stage 2 as the current side, and stage 3 as the incoming side.
Question 5 of 8
Where are `<<<<<<<`, `=======`, and `>>>>>>>` normally visible during a conflict?
Conflict markers are written into the working-tree file so the competing text can be inspected.
Question 6 of 8
During the unresolved merge, what does `MERGE_HEAD` identify?
`MERGE_HEAD` records the commit being merged into the current branch during an in-progress merge.
Question 7 of 8
What should `git diff` do in this lesson?
`git diff` is used here to inspect unresolved state; it does not itself resolve or commit the merge.
Question 8 of 8
What conceptual work is deliberately deferred to the next lessons?
Resolution and merge completion/abort are separate state-machine steps owned by later lessons.
Quiz results
0/0
Review
-
What does a conflicting merge leave behind?Hint used
-
Why is a non-zero merge exit status not the whole state description?Hint used
-
What does `git status --short` commonly report for a two-sided content conflict?Hint used
-
What do index stages 1, 2, and 3 represent for an unmerged path?Hint used
-
Where are `<<<<<<<`, `=======`, and `>>>>>>>` normally visible during a conflict?Hint used
-
During the unresolved merge, what does `MERGE_HEAD` identify?Hint used
-
What should `git diff` do in this lesson?Hint used
-
What conceptual work is deliberately deferred to the next lessons?Hint used