gabriel / musehub public
feat patch feat/merge-docs #2 / 2
AI Agent gabriel · 15 hours ago · Jun 12, 2026 · Diff

feat: add Merge Engine documentation page at /muse/merge (issue #89)

sha256:72c5112ca1b678f18ded66da761d9870d27047a13a8c51a9da07e01ccb1c255e sha
sha256:77fc45e703f90c0d603ecb1a0ce21ff21095728ca7dd0e146eb5e966c8f9fcc9 parent
+34 ~7 symbols
4 changed · 969 in snapshot files
sha256:a551e032655cc1889786b576c2f4e35de8229a3744013aded3918b0a7cfe8a6f snapshot
+34
symbols added
~7
symbols modified
4
files changed
969
files in snapshot
0
dead code introduced
Semantic Changes 41 symbols
~ musehub/templates/musehub/pages/docs_muse_merge.html .html 33 symbols added
+ aside@12 section aside@12 L12–37
+ h1: Merge Engine section h1: Merge Engine L50–50
+ h2: CLI reference section h2: CLI reference L761–761
+ h2: Engine model section h2: Engine model L156–156
+ h2: Harmony integration section h2: Harmony integration L717–717
+ h2: History modes section h2: History modes L283–283
+ h2: Overview section h2: Overview L74–74
+ h2: Proposal merge section h2: Proposal merge L539–539
+ h2: Safe merge protocol section h2: Safe merge protocol L608–608
+ h2: Strategy reference section h2: Strategy reference L228–228
+ h2: The flag section h2: The flag L392–392
+ h2: Three altitudes section h2: Three altitudes L96–96
+ h2: — local merge section h2: — local merge L456–456
+ h3: Exit codes section h3: Exit codes L495–495
+ h3: Flags section h3: Flags L481–481
+ h3: Proposal merge flags section h3: Proposal merge flags L592–592
+ h3: Strategy × history matrix — pick one of each section h3: Strategy × history matrix — pick one of each L560–560
+ h3: h3 section h3: h3 L681–681
+ main#main-content section main#main-content L40–799
+ nav[Docs navigation] section nav[Docs navigation] L13–36
+ nav[Phase navigation] section nav[Phase navigation] L787–796
+ section#cli section section#cli L760–797
+ section#engine-model section section#engine-model L155–224
+ section#explain section section#explain L391–452
+ section#granularity section section#granularity L95–152
+ section#harmony section section#harmony L716–757
+ section#history section section#history L282–336
+ section#local-merge section section#local-merge L455–535
+ section#on-conflict section section#on-conflict L339–388
+ section#overview section section#overview L73–92
+ section#proposal-merge section section#proposal-merge L538–604
+ section#safe-protocol section section#safe-protocol L607–713
+ section#strategy section section#strategy L227–279
~ musehub/api/routes/musehub/ui_docs.py .py 1 symbol added, 1 symbol modified
+ docs_merge function async_function docs_merge L85–90
~ _PHASES
~ musehub/templates/musehub/pages/docs_muse_harmony.html .html 3 symbols modified
~ main#main-content
~ nav[Phase navigation]
~ section#cli
~ musehub/templates/musehub/pages/docs_muse_intelligence.html .html 3 symbols modified
~ main#main-content
~ nav[Phase navigation]
~ section#rituals
Files Changed
+1 ~3
969 in snapshot
+ musehub/templates/musehub/pages/docs_muse_merge.html .html
~ musehub/api/routes/musehub/ui_docs.py .py
~ musehub/templates/musehub/pages/docs_muse_harmony.html .html
~ musehub/templates/musehub/pages/docs_muse_intelligence.html .html
← Older Oldest on feat/merge-docs
All commits Newer chore: renumber phases — merge is 05, shift harmony through secu… sha256:9f5112c9a633a22e53a831c6d3af637093d0ceb914393749905187046f1c548a

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:72c5112ca1b678f18ded66da761d9870d27047a13a8c51a9da07e01ccb1c255e --body "your comment"