Git Merge Continue and Abort Quiz

Review

1. What does `git merge --continue` require after a conflict?

   Continue concludes an interrupted merge after the conflicts have been resolved and staged.
2. What does a successful continuation create in a true two-head merge?

   A true merge records both input tips as parents of a new merge commit.
3. What is the purpose of `git merge --abort`?

   Abort is the explicit escape from the current merge-resolution process.
4. After all conflicts are staged but before `git merge --continue`, which can still be true?

   Resolution prepares the index but does not itself create the merge commit.
5. Which evidence proves a completed true merge recorded both input histories?

   The two parent IDs are the durable history evidence of a two-head merge commit.
6. Why does the curriculum use clean disposable repositories when demonstrating `git merge --abort`?

   Git documents limitations when non-trivial uncommitted work existed when the merge began.
7. Which sequence is the correct completion path after a conflict?

   The merge must be resolved and staged before the continuation step can seal the merge.
8. Which statement correctly separates abort from reset?

   Abort is a merge-specific state transition, with documented limitations around pre-existing uncommitted work.