README.md markdown
55 lines 2.3 KB
Raw
sha256:07c10b6184a651841b238710523048c817c5c062f2435c64628f6e407e9d55e3 Fix stale 'under seven minutes' claim in THE POINT section Sonnet 5 minor ⚠ breaking 6 hours ago

Episode 01 --- Demo Assets

Supporting the-whole-workflow.md. Two very different kinds of demo content live in this directory --- read this before running anything.

hello-muse/ --- hand-driven, not script-generated

This is the repo the episode actually walks through on screen: init, first commit, branching, merging, pushing, cloning. It is deliberately not built by a script --- you type the commands live, following the FIRST COMMIT through CLONE sections of the-whole-workflow.md directly. That's the point of the episode; a script would defeat it.

If it doesn't exist (or you've nuked it to start clean, which is normal --- it gets rebuilt from scratch every time you rehearse or record):

mkdir hello-muse
cd hello-muse
muse init

...then continue following the script from there. It's disposable; delete it and start over as often as you want.

make-git-vs-muse-episode01-demo.sh --- fully scripted, run it directly

./make-git-vs-muse-episode01-demo.sh

No arguments, no setup --- this one is self-contained, matching the convention every other episode uses. It does not depend on hello-muse existing; run it independently, any time, in any order.

Builds three disposable repos and prints real, screenshot-ready terminal output for the MERGE and WHERE THEY ACTUALLY DIVERGE sections:

  • git-comparison-episode01/ --- real Git repo, the friendlier/farewell two-branch merge (non-overlapping edits). Both merges succeed cleanly --- this is the "Git isn't broken here either" honesty beat, not a failure case.
  • imports-git-episode01/ --- real Git repo, two branches each adding a different import to the same file. This one does produce a real conflict (CONFLICT (content): Merge conflict in app.py) --- the actual <<<<<<</=======/>>>>>>> markers printed are genuine Git output, not staged.
  • imports-muse-episode01/ --- the identical two-branch imports scenario, in Muse. Merges cleanly (Merge made by the three-way strategy) --- the real contrast the section is built around.

Re-run the script any time the wording or exact demo content changes in the .md file, so the printed output always matches what's actually described. All three output directories are disposable scratch content --- re-run rather than hand-editing; if a demo needs to change, change the script.

File History 1 commit
sha256:07c10b6184a651841b238710523048c817c5c062f2435c64628f6e407e9d55e3 Fix stale 'under seven minutes' claim in THE POINT section Sonnet 5 minor 6 hours ago