- README: drop blog/ and handoff.md from the layout (won't be on the mirror),
repoint the wiki URL to the GitHub wiki, refresh the Status line with the
skip-friendly lab note.
- Module 1 download URL: point at the github.com/recklessop mirror so the
public copy's "Get the course materials" step resolves.
- the-workflow-syllabus.md: reflect the AI-drives-git reframe (M1-3 by hand;
M4 pivot; calculator analogy; learner directs+verifies, doesn't type git),
Claude Code as the concrete worked example (model-agnostic in principle),
Module 6 rescoped to "Branches: Sandboxes for AI Experiments" (M3 first-teaches
branches; M6 doesn't re-teach), lesson=theory rule, the skip-friendly lab
format, and no-slop voice. All 27 modules + capstone preserved; nothing
reordered. Em-dash count: 0.
- .github/workflows/ci.yml: fix the hardcoded owner to `recklessop`.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TfzV5QvtPDz8LJS3Pu5VLT
A current frontier editor-agent told to "merge X into Y" resolves the
conflict and completes the merge in one turn, so the learner never sees a
marker. The old Part C assumed Git would stop and ask. Rework the lab into
a three-beat sequence: witness the conflict once (agent stop-on-conflict
idiom, as in Module 26), undo it with `git merge --abort`, then let the AI
merge for real and auto-resolve while the learner does the one job still
theirs: verify with `git diff` after every merge.
Updates the matching surfaces so they tell one story: learning objective
#4, the Merge-conflicts key concept, the AI-angle bullet, the
Where-it-breaks bullet, Check-for-understanding, the blog mirror, and the
make-conflict.sh on-screen guidance (read the markers yourself first).
Closes#97
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KCv6VTpBG6Zo4xR4AvUQpj
claude
justin