feat: add muse resolve command (issue #8 phase 2)
Implements the `muse resolve` CLI command which marks conflict paths as resolved in MERGE_STATE after manual editing.
- resolve_path / resolve_symbol primitives from phase 1 are exposed via CLI - Supports plain file paths and symbol-address targets (file::Symbol) - --all flag drains the entire conflict list - --json flag for agent consumption - Prints per-entry confirmation and remaining conflict count - Prints staging + commit guidance when all conflicts are cleared - Registered in app.py with full --help documentation
sha256:d22ae2a43e397fa1a33efa343f79f94f07d76b29ad01b5ecedf232570db2ba8c
sha
2 changed · 1041 in snapshot
files
sha256:6f8da41f7acf4ab891dacc56b16a783b4b1e6245b9a71e6195f211600efd303c
snapshot
2
files changed
1041
files in snapshot
Files Changed
+1
~1
1041 in snapshot
+1
~1
1041 in snapshot
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:d22ae2a43e397fa1a33efa343f79f94f07d76b29ad01b5ecedf232570db2ba8c --body "your comment"
No comments yet. Be the first to start the discussion.