gabriel / build-with-muse public
episode-08/script #1 / 2
AI Agent gabriel · 4 hours ago · Sep 12, 2026 · Diff

Add Episode 08 script: The Merge Engine

Real merge-base lookup, dry-run conflict prediction verified to leave the working tree untouched, a genuine same-symbol conflict (two branches independently changing calc.py::add's return logic differently) with real conflict markers, real muse conflicts output showing kind=symbol (not kind=file), and a real muse resolve + commit cycle. Also documents the real merge_ops dispatch path (two diff() calls + one merge_ops() call) from muse/core/merge_engine.py.

While researching this episode, found a real false-conflict bug (two branches adding a trailing comment to different functions in the same file falsely conflicts at the whole-file level) -- filed as staging#92, deliberately not used on screen. The conflict example actually used in this episode is a different, genuine same-symbol conflict, verified multiple times before scripting.

Updated README's status table: episode 08 script done.

Co-Authored-By: Claude Sonnet 5 <[email protected]>

sha256:0cb6ca49176c7b9291549e7cba245ebbbdd7705d872cda7d301e82bba37a6122 sha
sha256:5b88205738295649379e4b0f0246313ac4d7383e75419ae12fbac15d127ee1e4 parent
~2 symbols
3 changed · 38 in snapshot files
sha256:d446c8f1f4c1bdb7d4f2ba402d7d2f0a4826539dc375719189f8a4b793bbbd17 snapshot
~2
symbols modified
3
files changed
38
files in snapshot
0
dead code introduced
Semantic Changes 2 symbols
~ README.md .md 2 symbols modified
~ Build With Muse
~ Status
· episode-08/the-merge-engine.md .md
Files Changed
+1 ~1 −1
38 in snapshot
+ episode-08/the-merge-engine.md .md
~ README.md .md
− episode-08/_tmp-script.md .md
Older temp: stage episode 08 script under temp name sha256:5b88205738295649379e4b0f0246313ac4d7383e75419ae12fbac15d127ee1e4 All commits
Newer → Latest on episode-08/script

0 comments

No comments yet. Be the first to start the discussion.

To add a comment, use the Muse CLI: muse hub commit comment sha256:0cb6ca49176c7b9291549e7cba245ebbbdd7705d872cda7d301e82bba37a6122 --body "your comment"