fix(merge): Phase 3 — apply_manifest before write_merge_state in conflict path
Swaps the order of apply_manifest and write_merge_state in the merge conflict path so the working tree is updated before the state file is written.
A crash after write_merge_state but before apply_manifest left MERGE_STATE.json claiming a conflict while the working tree was still at 'ours' — the user could not resolve anything (stuck state). With the new order, a crash after apply_manifest leaves a dirty tree with no MERGE_STATE.json, which is recoverable: re-run muse merge.
4-test suite in test_phase3_merge_state_ordering.py: call order assertion, integration (file + status), crash recovery.
sha256:33e25d81882e18becd7cc4d8dfe5b4ce008387961698d019f24065a7950f7be0
sha
sha256:e308c93b6fb1d002b5342609e61f05638bcfde0b6064137df27c9270bfe787ec
snapshot
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:33e25d81882e18becd7cc4d8dfe5b4ce008387961698d019f24065a7950f7be0 --body "your comment"
No comments yet. Be the first to start the discussion.