mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-21 03:39:54 +00:00
c57d5cbdde
When 'hermes update' stashes local changes and the restore hits conflicts, the previous behavior silently ran 'git reset --hard HEAD' to clean up. This could surprise users who didn't realize their working tree was being nuked. Now the conflict handler: - Lists the specific conflicted files - Reassures the user their stash is preserved - Asks before resetting (interactive mode) - Auto-resets in non-interactive mode (prompt_user=False) - If declined, leaves the working tree as-is with guidance