feat(stage): muse code add auto-resolves conflict paths (git-idiomatic)
In git, `git add <file>` after editing a conflict is the resolution signal — no separate step. muse code add now does the same: any staged file that appears in MERGE_STATE conflict_paths is removed from that list automatically, so `muse commit` can proceed without an explicit `muse resolve`.
muse resolve remains available as an explicit escape hatch for --all, symbol-level resolution, and agent workflows.
sha256:45bf7b7727da29ab5c67698be748c0ab8300ce0b8523868994a4b06e54a54b4e
sha
sha256:6638c43f9db336c22e0a90e6f8973fc2905c02bd97a75a6fb381042022fce908
snapshot
Older
fix(merge): write Cohen Transform conflict markers to working tree
sha256:681cefc30edc150defde5affbfae111caa9bca1282b6f1662f08dd1f0bf5ca5b
All commits
Newer
fix(merge): fix AttributeError in --abort when reading staged en…
sha256:49292e4e737a56c0bafaa0f46a1c1ce73de5385b558da60c7ed3196e2f43bb45
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:45bf7b7727da29ab5c67698be748c0ab8300ce0b8523868994a4b06e54a54b4e --body "your comment"
No comments yet. Be the first to start the discussion.