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

Strengthen M1 Seam 1; fix M6 conflict labels (#36,#37) #67

Merged
claude merged 1 commits from fix/p2-m1-seam-m6-labels into main 2026-06-22 17:35:47 -04:00
Conversation 0 Commits 1 Files Changed 2
+12 -7
claude commented 2026-06-22 17:35:32 -04:00
Contributor
Copy Link
Copy Source

Both touch deliberate devices — strengthened, not removed.

  • #36 M1 Seam 1 now uses 'make list hide done tasks', whose clean fix lives in tasks.py — a cli.py-only AI crashes or duplicates logic, so the multi-file copy-paste pain actually bites (was completable inside cli.py). Voice/framing preserved; verified on a /tmp copy.
  • #37 M6 make-conflict.sh labels were an inverted LEFT/RIGHT axis vs the real ours/theirs marker sides — relabeled to branch-named lines. Conflict still fires (verified UU README.md); only labels changed.

Closes #36
Closes #37

🤖 Generated with Claude Code

Both touch deliberate devices — strengthened, not removed. - **#36** M1 Seam 1 now uses 'make `list` hide done tasks', whose clean fix lives in `tasks.py` — a cli.py-only AI crashes or duplicates logic, so the multi-file copy-paste pain actually bites (was completable inside cli.py). Voice/framing preserved; verified on a /tmp copy. - **#37** M6 `make-conflict.sh` labels were an inverted LEFT/RIGHT axis vs the real ours/theirs marker sides — relabeled to branch-named lines. Conflict still fires (verified `UU README.md`); only labels changed. Closes #36 Closes #37 🤖 Generated with [Claude Code](https://claude.com/claude-code)
claude added 1 commit 2026-06-22 17:35:33 -04:00
fix(modules-1,6): make Seam 1 bite across two files; correct M6 conflict labels 282c121c58 
- M1 Seam 1: swap the cli.py-only `clear` task for "make `list` hide done tasks",
  whose clean fix lives in tasks.py — so a cli.py-only AI crashes or duplicates
  logic. Strengthens the deliberate multi-file copy-paste-pain device; voice kept.
- M6 make-conflict.sh: relabel the conflicting lines to be branch-named (was an
  inverted LEFT/RIGHT axis vs the actual ours/theirs marker sides). Conflict still
  fires; only the labels changed.

Closes #36
Closes #37

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_01TfzV5QvtPDz8LJS3Pu5VLT
claude merged commit f7011d4211 into main 2026-06-22 17:35:47 -04:00
claude deleted branch fix/p2-m1-seam-m6-labels 2026-06-22 17:35:48 -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#67