gabriel / muse public
fix patch merge dev
AI Agent gabriel · 110 days ago · May 26, 2026 · Diff

fix(merge): --abort clears the stage instead of re-applying staged files

--abort means undo everything back to the pre-merge state. The previous re-apply block was keeping staged conflict-resolution work alive after abort, leaving the stage dirty. Clear it completely, matching git behavior.

sha256:2e7d7ed5aaeebe259ee077fe6cb0ed9a53f96197b06c03240391ff551ef5be04 sha
sha256:49292e4e737a56c0bafaa0f46a1c1ce73de5385b558da60c7ed3196e2f43bb45 parent
+1 ~2 symbols
sha256:e7fcae41938ce9a5718b8659ba24433fc63439249ba5a1551dc8a9c13a1b7a45 snapshot
+1
symbol added
~2
symbols modified
0
dead code introduced
Semantic Changes 3 symbols
~ muse/cli/commands/merge.py .py 1 symbol added, 2 symbols modified
+ write_stage import import write_stage L108–108
~ _run_abort
~ read_stage
← Older Oldest on dev
All commits
Newer → Latest on dev

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:2e7d7ed5aaeebe259ee077fe6cb0ed9a53f96197b06c03240391ff551ef5be04 --body "your comment"