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

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

Browse Source 
- 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
This commit is contained in:
Claude (agent)
2026-06-22 17:35:32 -04:00
parent 3f096c71ff
commit 282c121c58
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/06-branches-sandboxes-for-experiments/lab/make-conflict.sh
+2 -2
View File
@@ -47,14 +47,14 @@ git branch -D "$BRANCH_B" >/dev/null 2>&1 || true
# 5. Branch A: append one version of a line, commit.
git switch -c "$BRANCH_A" >/dev/null
printf '\n<!-- practice line: KEEP THE LEFT VERSION -->\n' >> "$FILE"
printf '\n<!-- practice line added on branch A -->\n' >> "$FILE"
git add "$FILE"
git commit -q -m "practice: append line (branch A)"
# 6. Branch B (off the original branch): append a DIFFERENT version to the same spot, commit.
git switch "$START_BRANCH" >/dev/null
git switch -c "$BRANCH_B" >/dev/null
printf '\n<!-- practice line: KEEP THE RIGHT VERSION -->\n' >> "$FILE"
printf '\n<!-- practice line added on branch B -->\n' >> "$FILE"
git add "$FILE"
git commit -q -m "practice: append line (branch B)"