justin/ai-workflow-course
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Git-command chain hygiene (#33,#34,#35) #63

Merged
claude merged 1 commits from fix/p2-git-chain-hygiene into main 2026-06-22 17:06:58 -04:00
Conversation 0 Commits 1 Files Changed 4
+33 -15
claude commented 2026-06-22 17:06:44 -04:00
Contributor
Copy Link
Copy Source

Dependency-chain accounting fixes.

  • #33 M11 keeps git reset --hard HEAD~1 (needed to trigger the protected-branch rejection) but flags it as a later, history-rewriting command (Module 12).
  • #34 Stop presenting rebase/pull --rebase as a casual step: M8 leads with recreate-remote and footnotes pull --rebase as out-of-scope (plain pull still noted to fail on unrelated histories); M26 merge-only; M11 rebase-merge as out-of-scope awareness only.
  • #35 M6 adds Module 3 to prerequisites + back-references the branch material M3 first taught.

No deliberate device touched (M12's reset/reflog teaching intact). Verified by grep: no un-noted forward-refs of the targeted kind remain.

Closes #33
Closes #34
Closes #35

🤖 Generated with Claude Code

Dependency-chain accounting fixes. - **#33** M11 keeps `git reset --hard HEAD~1` (needed to trigger the protected-branch rejection) but flags it as a later, history-rewriting command (Module 12). - **#34** Stop presenting `rebase`/`pull --rebase` as a casual step: M8 leads with recreate-remote and footnotes `pull --rebase` as out-of-scope (plain pull still noted to fail on unrelated histories); M26 merge-only; M11 rebase-merge as out-of-scope awareness only. - **#35** M6 adds Module 3 to prerequisites + back-references the branch material M3 first taught. No deliberate device touched (M12's reset/reflog teaching intact). Verified by grep: no un-noted forward-refs of the targeted kind remain. Closes #33 Closes #34 Closes #35 🤖 Generated with [Claude Code](https://claude.com/claude-code)
claude added 1 commit 2026-06-22 17:06:44 -04:00
fix(chain): note forward-referenced git commands; fix M6 prerequisites f437d7683b 
- M11: keep `git reset --hard HEAD~1` (needed to trigger the protected-branch
  rejection) but flag it as a later-module, history-rewriting command (Module 12).
- Stop presenting rebase/pull --rebase as a casual step: M8 leads with the
  beginner-safe recreate-remote and footnotes pull --rebase as out-of-scope;
  M26 merge-only; M11 mentions rebase-merge only as out-of-scope awareness.
- M6: add Module 3 to prerequisites and back-reference the branch material it
  first taught (branch/switch/merge on docs).

Closes #33
Closes #34
Closes #35

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_01TfzV5QvtPDz8LJS3Pu5VLT
claude merged commit 6d28567c12 into main 2026-06-22 17:06:58 -04:00
claude deleted branch fix/p2-git-chain-hygiene 2026-06-22 17:06:59 -04:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
ai-ready
Scoped and ready to implement
 autopilot
Drive end-to-end autonomously (claude-deck)
 autopilot-careful
Autopilot may scope/implement but never auto-merge
 bug
Defect
 feature
New capability
 needs-human
Autopilot stalled or vetoed — a human must act
 P0
Critical
 P1
High
 P2
Normal
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
justin (Justin Paul)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: justin/ai-workflow-course#63