gabriel / muse public
feat patch task/phase1-merge-engine #15 / 16
AI Agent gabriel · 89 days ago · Jun 11, 2026 · Diff

feat: Phase 1 — MergeEngine class, --on-conflict, --history flags, strategy vocab (snapshot/replay)

sha256:981b89ffe0b877cbb076d011e5d9148ad88c255b66a4eef5cafac7f11ce26ab1 sha
sha256:e7283cd82f2f9cef3de581b97fd8ac849509ccc66861b6c81680144ffcd166c3 parent
+6 ~36 symbols
sha256:fc0241f91ad4c63a672cff8ec1e9be716225ddfb936bf00a54ad1564003d22f1 snapshot
+6
symbols added
~36
symbols modified
0
dead code introduced
Semantic Changes 42 symbols
~ muse/cli/commands/merge.py .py 4 symbols modified
~ _MergeJsonBase
~ _run_merge
~ register
~ run
~ muse/core/merge_engine.py .py 5 symbols added
+ MergeEngine class class MergeEngine L599–627
+ __post_init__ method method __post_init__ L617–627
+ STRATEGY_MAP variable variable STRATEGY_MAP L630–635
+ _VALID_DIFF_UNITS variable variable _VALID_DIFF_UNITS L594–594
+ _VALID_RESOLUTIONS variable variable _VALID_RESOLUTIONS L595–595
~ tests/test_phantom_conflicts.py .py 2 symbols modified
~ TestPhantomConflicts
~ test_PHANTOM_03_state_merge_strategy_untouched_file
~ tests/test_phase1_merge_engine.py .py 1 symbol added, 30 symbols modified
+ cli variable variable cli L25–25
~ TestHistoryFlag
~ test_HI_01_history_flag_exists
~ test_HI_02_history_merge_accepted
~ test_HI_03_history_squash_accepted
~ test_HI_04_history_rebase_accepted
~ test_HI_05_history_invalid_rejected
~ test_HI_06_history_merge_produces_two_parent_commit
~ test_HI_07_history_squash_produces_single_parent_commit
~ test_HI_08_json_output_includes_history
~ TestOnConflictFlag
~ test_OC_01_on_conflict_flag_exists
~ test_OC_02_on_conflict_escalate_accepted
~ test_OC_03_on_conflict_ours_accepted
~ test_OC_04_on_conflict_theirs_accepted
~ test_OC_05_on_conflict_invalid_rejected
~ test_OC_06_on_conflict_ours_resolves_conflict
~ test_OC_07_on_conflict_theirs_resolves_conflict
~ test_OC_08_escalate_surfaces_conflict
~ test_OC_09_strategy_ours_alias_equals_on_conflict_ours
~ test_OC_10_json_output_includes_on_conflict
~ TestStrategyFlag
~ test_ST_01_strategy_recursive_accepted
~ test_ST_02_strategy_overlay_accepted
~ test_ST_03_strategy_snapshot_accepted
~ test_ST_04_strategy_replay_accepted
~ test_ST_05_strategy_ours_accepted
~ test_ST_06_strategy_theirs_accepted
~ test_ST_07_state_merge_rejected
~ test_ST_08_state_replay_rejected
~ test_ST_09_json_output_includes_strategy
Older test: Phase 1 TDD — MergeEngine class, --strategy, --on-conflict… sha256:e7283cd82f2f9cef3de581b97fd8ac849509ccc66861b6c81680144ffcd166c3 All commits Newer feat: route merge.py through STRATEGY_MAP; update hub proposal m… sha256:0ab1022a97637701da7c18808e65556a5c774a1572b42e02599ff55efaf69ef4

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