{"repo":"NousResearch/hermes-agent","public_id":"124641","display_label":"Autostash lost when update conflicts with untracked files","summary":"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.","subsystem":null,"counts":{"members":3,"open_issues":0,"open_issues_distinct":0,"open_prs":0,"closed_issues":1,"merged_prs":1,"attempt_prs":1},"landed_fix":{"status":"merged_to_main","basis":"structural","pr":124697,"merged_at":"2026-09-27T09:53:33+00:00"},"resolution":{"state":"resolved","by":"pr-124697"},"freshness":{"state":"verified","last_verified_at":"2026-09-27T09:53:33+00:00","is_stale":false},"grouping":{"backbone":"STRUCTURAL_SPANNING","link_density":0.6666666666666666},"fix_edges":[{"issue_number":124641,"pr_number":124697,"tier":"verified","basis":"closing_ref","confidence":0.95,"recoverable_from_timeline":true,"pr_merged_at":"2026-09-27T09:53:33+00:00"}],"members":[{"kind":"issue","number":124641,"title":"hermes update drops a user's untracked file when upstream adds the same path (\"kept as-is\" but replaced, autostash dropped)","url":null,"state":"closed"},{"kind":"pr","number":124655,"title":"fix(update): keep the autostash when stashed untracked files collide with updated paths","url":null,"state":"closed","close_reason":{"refs":[{"kind":"pr","value":"#124697","number":124697},{"kind":"pr","value":"#124641","number":124641}],"category":"superseded_by_pr","implication":"superseded"},"merged":false},{"kind":"pr","number":124697,"title":"fix(update): keep the autostash when the update replaced a user's untracked file","url":null,"state":"merged","close_reason":{"category":"merged"},"merged":true,"is_fix_pr":true,"fix_tier":"verified","files_changed":["hermes_cli/update_cmd_stash.py","tests/e2e/core/upgrade/git/test_local_modifications.py","tests/hermes_cli/test_update_autostash.py"]}],"trust":{"default_tier":"verified","includes_suggested":false}}