Reframe M1-6: AI drives git, lesson=theory, de-slop + issue fixes (#92)

Co-authored-by: claude <claude@jpaul.io>
Co-committed-by: claude <claude@jpaul.io>

modules/06-branches-sandboxes-for-experiments/lab/make-conflict.sh

@@ -10,7 +10,7 @@
 # then `git add` + `git commit`.
 #
 # Copy it into your tasks-app repo, then run it from inside the repo:
-#     cp /path/to/modules/06-branches-sandboxes-for-experiments/lab/make-conflict.sh .
+#     cp ~/ai-workflow-course/the-workflow-course/modules/06-branches-sandboxes-for-experiments/lab/make-conflict.sh .
 #     bash make-conflict.sh
 #
 # It is non-destructive to your real work: it only touches README.md on two throwaway practice
@@ -73,11 +73,11 @@ echo "================================================================"
 echo
 echo " Next steps (the skill you're practicing):"
 echo "   1. git status                # see $FILE under 'Unmerged paths'"
-echo "   2. open $FILE and find the <<<<<<< / ======= / >>>>>>> markers"
-echo "   3. edit it to the version you want; delete all three marker lines"
-echo "      (or ask your editor-integrated AI to resolve it, then verify)"
-echo "   4. git add $FILE"
-echo "   5. git commit              # completes the merge"
+echo "   2. ask your agent to resolve the conflict in $FILE and complete the merge"
+echo "      (\"resolve the conflict markers in $FILE and finish the merge\")"
+echo "   3. verify: open $FILE, confirm no <<<<<<< / ======= / >>>>>>> markers remain"
+echo "   4. git log --oneline --graph # confirm the merge commit landed"
+echo "   (to do it by hand instead: edit out the markers, then git add $FILE && git commit)"
 echo
 echo " Chicken out? Undo the whole thing with:  git merge --abort"
 echo