feat: implement muse merge-tree — three-way merge without working-tree mutation
- Pure in-memory three-way merge using existing diff_snapshots / detect_conflicts / apply_merge primitives - Resolves branch refs via HEAD, branch name, or full commit ID - Computes LCA via find_merge_base (bidirectional BFS) or --base override - Conflict paths reported with null object_id in merged_manifest - --write-objects persists the conflict-free merged snapshot for use with commit-tree - No MERGE_STATE.json written, no working-tree I/O, no branch ref updates - 25 tests: clean merge, conflicts, trivial, explicit base, working-tree isolation, write-objects, text output, error cases, ANSI rejection, 50-file stress
sha256:1b4d8fc22bde0b07389ba32ab25df236d960705dbd7a9917bc8f7acd91212358
sha
sha256:38ea2e597dfe8f312d91451f5ed3a65d8950e12bc1ea70e63884d477575e3ccd
snapshot
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:1b4d8fc22bde0b07389ba32ab25df236d960705dbd7a9917bc8f7acd91212358 --body "your comment"
No comments yet. Be the first to start the discussion.