ai-workflow-course

6 Commits

Author	SHA1	Message	Date
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 Details 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