gabriel / muse public
feat patch resolve task/issue-8-phase5 #1 / 1
AI Agent gabriel · 20 days ago · May 21, 2026 · Diff

feat(resolve): phase 5 — resolved conflict tracking in conflicts and status

muse conflicts --json now includes resolved_count and resolved_conflicts (entries from original_conflict_paths that are no longer in conflict_paths). Text output shows progress when some are resolved.

muse status --json now includes resolved_conflict_paths and resolved_conflict_count, always present. Text merge banner shows (N resolved) progress hint and muse resolve guidance.

Closes issue #8 phase 5.

sha256:7f8df71179860c428bbd461c5ddb1287a19eb1fd67d89c3b8660f7f372e9668c sha
sha256:f61171578c887cada67a384f0580dd8b392625934c03fefd45df9bb0e24fe78f parent
3 changed · 1044 in snapshot files
sha256:2b78e54bd5357b11191adfae2ab8bf677a1ac025cc1308e217881b820eca6899 snapshot
3
files changed
1044
files in snapshot
Files Changed
+1 ~2
1044 in snapshot
+ tests/test_resolve_phase5.py .py
~ muse/cli/commands/conflicts.py .py
~ muse/cli/commands/status.py .py
← Older Oldest on task/issue-8-phase5
All commits
Newer → Latest on task/issue-8-phase5

0 comments

No comments yet. Be the first to start the discussion.

To add a comment, use the Muse CLI: muse hub commit comment sha256:7f8df71179860c428bbd461c5ddb1287a19eb1fd67d89c3b8660f7f372e9668c --body "your comment"