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

feat: add merge_result sub-object to muse merge --json (deliverable 5)

sha256:c2e22a54a80ab87150301919c6ac33c0bbafeb39840df86bfbef413147165feb sha
sha256:0ab1022a97637701da7c18808e65556a5c774a1572b42e02599ff55efaf69ef4 parent
+10 ~2 symbols
sha256:0818a65f65a3092adba6e81103ef0845bba73a25b751dc7cef7509fb704099b9 snapshot
+10
symbols added
~2
symbols modified
0
dead code introduced
Semantic Changes 12 symbols
~ muse/cli/commands/merge.py .py 1 symbol added, 2 symbols modified
+ _MergeResultDict class class _MergeResultDict L131–140
~ _MergeJsonBase
~ _run_merge
~ tests/test_phase1_merge_engine.py .py 9 symbols added
+ TestMergeResultShape class class TestMergeResultShape L541–642
+ _clean_merge_repo method method _clean_merge_repo L549–560
+ test_MR_01_merge_result_present_on_clean_merge method method test_MR_01_merge_result_present_on_clean_merge L562–568
+ test_MR_02_merge_result_fields method method test_MR_02_merge_result_fields L570–585
+ test_MR_03_merge_result_on_fast_forward method method test_MR_03_merge_result_on_fast_forward L587–595
+ test_MR_04_merge_result_on_dry_run method method test_MR_04_merge_result_on_dry_run L597–605
+ test_MR_05_merge_result_mirrors_top_level_files_changed method method test_MR_05_merge_result_mirrors_top_level_files_changed L607–613
+ test_MR_06_musehub_model_has_merge_result_field method method test_MR_06_musehub_model_has_merge_result_field L615–622
+ test_MR_07_merge_result_embed_construction method method test_MR_07_merge_result_embed_construction L624–642
Older feat: route merge.py through STRATEGY_MAP; update hub proposal m… sha256:0ab1022a97637701da7c18808e65556a5c774a1572b42e02599ff55efaf69ef4 All commits Newer test: add Phase 2 conflict granularity tests (CE_01-04, DE_01-04… sha256:e8b20c39f3247608af4212654b5c6476cec7034bc40f8a3eb714b7b4bfc41b7f

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