Commit Graph
7 Commits
Author SHA1 Message Date
justinandClaude Opus 4.8 65c6c6b2b6 docs: sort Prerequisites lists numerically ascending (#100)
CI / check (pull_request) Successful in 6s
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) <[email protected]>
Claude-Session: https://claude.ai/code/session_01CamgR4HaVpfaqUViuHUcWw
2026-06-23 09:53:05 -04:00
justin 8e0ae0d58a Merge pull request 'Module 6: reframe Part C around the AI silently auto-resolving conflicts' (#99) from claude/issue-97 into main
Sync course wiki / sync-wiki (push) Successful in 5s
Reviewed-on: #99
2026-06-23 09:07:34 -04:00
justinandClaude Opus 4.8 0f8e7497a4 Module 6: reframe Part C around the AI silently auto-resolving conflicts (#97)
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) <[email protected]>
Claude-Session: https://claude.ai/code/session_01KCv6VTpBG6Zo4xR4AvUQpj
2026-06-23 09:03:40 -04:00
justin a4ea86fd23 Merge pull request 'docs(blog): jpaul.me blog series for the course (17 posts)' (#69) from claude/blog-posts into main
Reviewed-on: justin/the-workflow-course#69
2026-06-22 18:05:37 -04:00
justin 4bd586bbd0 Delete HANDOFF.md 2026-06-22 10:07:56 -04:00
justin ced344db9b Add HANDOFF.md 2026-06-21 23:03:08 -04:00
justin 9e9bb515ee Initial commit 2026-06-21 23:02:29 -04:00