gabriel / muse public
task/phase1-merge-engine #4 / 16
gabriel · 11 hours ago · Jun 12, 2026 · Diff

update agent.md to include Safe Merge Protocol

sha256:3db35e858ee12a4777e7fdaa3e5b29b7b34749d5a17368647c6576b635ec770b sha
sha256:99451767674c70e97323b61d5ef248ebe91530a91c2ab5902c2bb3e4acf250dd parent
+11 ~16 symbols
sha256:3534e174af0f0484167c2147557978cc10e20a5d6b2d90d1357c9dbcd29c6653 snapshot
+11
symbols added
~16
symbols modified
0
dead code introduced
Semantic Changes 27 symbols
~ docs/agent-guide.md .md 11 symbols added, 16 symbols modified
~ code[bash]@L1033
~ code[bash]@L1041
~ code[bash]@L1050
~ code[bash]@L1056
~ code[bash]@L1255
~ code[bash]@L1264
~ code[bash]@L1275
~ code[bash]@L1290
~ code[bash]@L1306
~ code[bash]@L1315
~ code[bash]@L1324
~ code[bash]@L1334
~ code[bash]@L1346
+ Safe Merge Protocol — never trust commit messages, always inspect content section Safe Merge Protocol — never trust commit messages, always inspect content L298–381
+ Step 1 — Understand the topology section Step 1 — Understand the topology L305–318
+ code[bash] variable variable code[bash] L309–314
+ Step 2 — Read what commits are unique to each branch section Step 2 — Read what commits are unique to each branch L318–337
+ code[bash]@L322 variable variable code[bash]@L322 L322–329
+ code[bash]@L333 variable variable code[bash]@L333 L333–336
+ Step 3 — Dry-run the merge section Step 3 — Dry-run the merge L337–349
+ code[bash] variable variable code[bash] L341–344
+ Step 4 — Merge, test, then promote section Step 4 — Merge, test, then promote L349–368
+ code[bash] variable variable code[bash] L351–365
+ Why --ours / --theirs caused the regressions section Why --ours / --theirs caused the regressions L368–381
~ Muse Ecosystem — Agent Guide
~ Branch Flow
~ Standard cycle
Older Run in a fresh repo so no stale MERGE_STATE.json can bleed in sha256:99451767674c70e97323b61d5ef248ebe91530a91c2ab5902c2bb3e4acf250dd All commits Newer minor docs updates. `^` syntax replaced w/ `..` sha256:be65ef1b8ae474deaa9c5fe9bde8114f4a32b29b8c26484cb2179a14070499b7

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:3db35e858ee12a4777e7fdaa3e5b29b7b34749d5a17368647c6576b635ec770b --body "your comment"