Autostash lost when update conflicts with untracked files
Cluster 124641. Data as of
Nothing open on GitHub. Fix merged in #124697 on 27 Sep 2026. Check it covers your case.
The short answer
- Known?
- Yes. 3 related items grouped here, 1 issue already closed.
- Fix event
- A fix was merged to main in PR #124697. Check it covers your case. No release data is tracked.
- Tracker
- The maintainers' tracker marks this
resolved, deciding PR #124697. That is separate from the fix event. - Still open
- 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.
Open issues0
Open PRs0
Fixes on record
-
#124697 fix(update): keep the autostash when the update replaced a user's untracked file
files:
hermes_cli/update_cmd_stash.py,tests/e2e/core/upgrade/git/test_local_modifications.py,tests/hermes_cli/test_update_autostash.py
1 PR closed without merging
From the close comments: superseded by another PR 1
-
#124655 fix(update): keep the autostash when stashed untracked files collide with updated paths · superseded by another PR →
#124697,#124641
Closed issues · 1
- Closed#124641hermes update drops a user's untracked file when upstream adds the same path ("kept as-is" but replaced, autostash dropped)
How this cluster was grouped
-
Link evidence (
structural links throughout): every member is connected by structural evidence: shared changed files, or a closing/superseded reference. -
Pairwise link density
0.67: the share of item pairs that carry a link, counting a structural link in full and a relevance-only link at 0.36.1.00means every pair is linked.
Pick up a Lab task
Check whether a fix covers the open issues here, with your own agent. Bring back evidence for maintainers.
Open the LabAt a glance
- Merged PRs
- #124697
- Closed issues
- 1
- Attempts
- 1 PR closed without merging
- Fix link checked
- 27 Sep 2026