# NousResearch/hermes-agent · Autostash lost when update conflicts with untracked files

## Open now

- Nothing open on GitHub.

These items concern a bug where the update process drops a user's autostash when stashed or untracked files collide with paths added by an upstream update. The fixes aim to preserve the autostash in these collision scenarios.

## TL;DR

- 3 member(s): 0 open issue(s), 1 closed issue(s), 0 open PR(s), 1 merged PR(s), 1 PR(s) closed without merging.
- A fix was merged to main in PR #124697. Verify it addresses your case.
- **Recommended:** read PR #124697 (and any competing PRs below) before filing. Confirm the merged change covers your symptom.

## Maintainer resolution verdict

- Internal-tracker verdict over this cluster's issue members: `resolved` · deciding PR(s): `pr-124697`. This is distinct from the fix status above. Weigh it yourself.

## How this cluster was grouped

- Link evidence (`STRUCTURAL_SPANNING`): every member is connected by structural evidence: shared changed files, or a closing/superseded reference.
- Pairwise link density `0.67`: the share of member pairs that carry a link, counting a structural link in full and a relevance-only link at 0.36. `1.00` means every pair is linked.

## Closed / duplicate issues

- #124641: hermes update drops a user's untracked file when upstream adds the same path ("kept as-is" but replaced, autostash dropped)

## Prior & competing PRs

- **#124697: fix(update): keep the autostash when the update replaced a user's untracked file**. merged to main · fix tier `verified`
  - maintainer direction: category `merged`
  - files: `hermes_cli/update_cmd_stash.py`, `tests/e2e/core/upgrade/git/test_local_modifications.py`, `tests/hermes_cli/test_update_autostash.py`
- **#124655: fix(update): keep the autostash when stashed untracked files collide with updated paths**. closed without merge
  - maintainer direction: category `superseded_by_pr`; implication `superseded`; refs `#124697`, `#124641`

## Fix status

- Merged to main in PR #124697 (cited above). No release data is tracked. Verify downstream.
- Fix last verified (merged) `2026-09-27`.