gabriel / muse public
feat patch task/phase1-merge-engine #14 / 16
AI Agent gabriel · 20 hours ago · Jun 11, 2026 · Diff

feat: route merge.py through STRATEGY_MAP; update hub proposal merge strategy choices

sha256:0ab1022a97637701da7c18808e65556a5c774a1572b42e02599ff55efaf69ef4 sha
sha256:981b89ffe0b877cbb076d011e5d9148ad88c255b66a4eef5cafac7f11ce26ab1 sha256:8c92016d30056bba10f40c739abdcef82334fd27185fe6d7f17bef3418f56131 parent
+1 ~8 symbols
sha256:64b166e374a1ef6bcbd25a79c3768628c8e1f7551d2b64eb758d513e52cb8810 snapshot
+1
symbol added
~8
symbols modified
0
dead code introduced
Semantic Changes 9 symbols
~ muse/cli/commands/hub/proposals.py .py 1 symbol modified
~ register
~ muse/cli/commands/merge.py .py 1 symbol added, 7 symbols modified
+ STRATEGY_MAP import import STRATEGY_MAP L67–67
~ _run_merge
~ apply_merge
~ detect_conflicts
~ diff_snapshots
~ find_merge_base
~ read_merge_state
~ write_merge_state
Older feat: Phase 1 — MergeEngine class, --on-conflict, --history flag… sha256:981b89ffe0b877cbb076d011e5d9148ad88c255b66a4eef5cafac7f11ce26ab1 All commits Newer feat: add merge_result sub-object to muse merge --json (deliverable 5) sha256:c2e22a54a80ab87150301919c6ac33c0bbafeb39840df86bfbef413147165feb

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:0ab1022a97637701da7c18808e65556a5c774a1572b42e02599ff55efaf69ef4 --body "your comment"