LAB07 — Chapter 7 practical exercise

Read the chapter and complete its worked example first. Use a fresh copy of the named resource/checkpoint so the starting state is recoverable.

Submit a review note rejecting the unrelated candidate edit, a resolved conflict README, and before/after evidence for the seeded fault. Keep each exercise in its designated disposable repository so restoring an uncommitted sentence cannot destroy work you meant to revert as history.

For each recovery, write four short fields: starting state; intended data to preserve; chosen command or edit; observed result. For restore, the intended loss is the explicitly unwanted uncommitted edit. For revert, preserve existing history plus a corrective commit. For conflict resolution, preserve both useful meanings and remove the markers.

You pass when final content meets the requirement, relevant tests show the intended recovery, and useful work remains accounted for. A blank diff alone is insufficient: you might have discarded the requested feature along with the fault. Compare final behavior with the original brief.

For a final self-check, explain the recovery before touching the keyboard. If your explanation is “get back to where it worked,” ask which file version, which commit, and which useful work must remain. That small pause turns a vague rescue attempt into a reviewable operation. You should be able to predict whether the command changes working content, staging, or history.

Submission check

Submit the named artifact with actual/synthetic/illustrative evidence labels. Include a starting state, action, result, and remaining limitation. Compare with the separately distributed instructor key after your own attempt. The chapter's completion checklist and transfer task remain part of the learning activity.