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

Author	SHA1	Message	Date
claude	282c121c58	fix(modules-1,6): make Seam 1 bite across two files; correct M6 conflict labels - 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) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TfzV5QvtPDz8LJS3Pu5VLT	2026-06-22 17:35:32 -04:00

Author

SHA1

Message

Date

claude

282c121c58

fix(modules-1,6): make Seam 1 bite across two files; correct M6 conflict labels

- 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) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TfzV5QvtPDz8LJS3Pu5VLT

2026-06-22 17:35:32 -04:00

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

1 Commits