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:e7fcae41938ce9a5718b8659ba24433fc63439249ba5a1551dc8a9c13a1b7a45
snapshot
Older
fix(merge): fix AttributeError in --abort when reading staged en…
sha256:49292e4e737a56c0bafaa0f46a1c1ce73de5385b558da60c7ed3196e2f43bb45
All commits
Newer
fix(log): correct graph connector for merge and convergence
sha256:da890ae29a29c9ed10ba547d56aa3ba35ec0c1087589e51a403b1cf9d0dbd907
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:2e7d7ed5aaeebe259ee077fe6cb0ed9a53f96197b06c03240391ff551ef5be04 --body "your comment"
No comments yet. Be the first to start the discussion.