6 commits

Author	SHA1	Message	Date
Teknium	3ab50376b0	fix(update): reset working tree when stash restore leaves conflict markers ... When `hermes update` stashes local changes and the subsequent `git stash apply` fails or leaves unmerged files, the conflict markers (<<<<<<< etc.) were left in the working tree, making Hermes unrunnable until manually cleaned up. Now the update command runs `git reset --hard HEAD` to restore a clean working tree before exiting, and also detects unmerged files even when git stash apply reports success. Closes #2348	2026-03-21 16:16:35 -07:00
Teknium	618ed2c65f	fix(update): use .[all] extras with fallback in hermes update (#1728) ... Both update paths now try .[all] first, fall back to . if extras fail. Fixes #1336. Inspired by PR #1342 by @baketnk.	2026-03-17 04:22:37 -07:00
teknium1	f882dabf19	fix(update): clarify manual autostash cleanup	2026-03-14 22:56:59 -07:00
teknium1	47c5c97654	fix(update): drop autostash by stash selector	2026-03-14 22:45:29 -07:00
teknium1	42c778b5eb	fix(update): warn and prompt before restoring autostash ... Add a restore prompt for interactive updates, keep the stash when the user declines, and print a post-restore warning that local changes were reapplied on top of updated code.	2026-03-14 05:50:18 -07:00
smillunchick	f764c7135d	fix: auto-stash local changes during updates	2026-03-14 05:44:48 -07:00