gabriel / muse public

muse/cli/commands/merge.py file

tracked since 1 day ago · 8.0×/wk avg
Commit velocity — 12 weeks · peak 8/wk
Op mix 8 modify
8
Changes
0
Versions
1
Authors
Gravity
Stability
60%
8 changes/30d

PROVENANCE

Every change, rename, and epoch across branches

patch 14 hours ago
gabriel via claude-code claude-sonnet-4-6 ✦ signed
task/phase1-merge-engine feat(merge): add --explain flag with per-path decision trace (Phase 8, E…
1h
patch 15 hours ago
gabriel via claude-code claude-sonnet-4-6 ✦ signed
task/phase1-merge-engine feat(phase6): unified MergeEngine code path via run_merge()
1h
patch 16 hours ago
gabriel via claude-code claude-sonnet-4-6 ✦ signed
task/phase1-merge-engine test(phase3): full strategy matrix — 24 SM tests, rebase→linear
patch 17 hours ago
gabriel via claude-code claude-sonnet-4-6 ✦ signed
task/phase1-merge-engine feat: add merge_result sub-object to muse merge --json (deliverable 5)
patch 17 hours ago
gabriel via claude-code claude-sonnet-4-6 ✦ signed
task/phase1-merge-engine feat: route merge.py through STRATEGY_MAP; update hub proposal merge str…
patch 17 hours ago
gabriel via claude-code claude-sonnet-4-6 ✦ signed
task/phase1-merge-engine feat: Phase 1 — MergeEngine class, --on-conflict, --history flags, strat…
10h
patch 1 day ago
gabriel via claude-code claude-sonnet-4-6 ✦ signed
task/fix-phantom-conflicts test: PHANTOM_01-05 regression tests + overlay/state_merge strategy alia…
patch ↻ earliest tracked
gabriel via claude-code claude-sonnet-4-6 ✦ signed
task/fix-phantom-conflicts fix: convergent-edit phantom conflicts in ops_commute + merge debug inst…

COUPLING PARTNERS

No co-changed symbols found.