Reorder the `## Prerequisites` bullets in 9 modules so prior modules
are listed lowest number first instead of by pedagogical importance or
at random. A trailing "Helpful but not required" group stays last and
is sorted within itself; multi-module bullets sort by their lowest
number. Intro/closing paragraphs are left in place. Prose is unchanged;
only bullet order moves.
Modules touched: 7, 9, 14, 15, 22, 24, 25, 26, 27. The other 18 modules
were already ascending (or have one/zero prereqs) and are untouched.
Module 19's "Helpful but not required: Module 16" correctly trails its
ascending 8/14/18 main list, so it stays as is.
Closes#100
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CamgR4HaVpfaqUViuHUcWw
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
justin
claude