Teknium c57d5cbdde fix(update): prompt before resetting working tree on stash conflicts (#2390) ...

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

2026-03-21 16:49:19 -07:00

159 KiB

Raw Blame History

View Raw