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)

Browse Source 
Co-authored-by: claude <claude@jpaul.io>
Co-committed-by: claude <claude@jpaul.io>
This commit was merged in pull request #67.
This commit is contained in:
Claude (agent)
2026-06-22 17:35:47 -04:00
committed by Claude (agent)
parent 3f096c71ff
commit f7011d4211
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)"