{"id":"24f0aff8-a26c-40e2-bc99-735004db8ce5","slug":"git-error-your-local-changes-to-the-096c","url":"https://api.modalhub.ai/r/git-error-your-local-changes-to-the-096c","urls":{"html":"https://api.modalhub.ai/r/git-error-your-local-changes-to-the-096c","md":"https://api.modalhub.ai/r/git-error-your-local-changes-to-the-096c.md","json":"https://api.modalhub.ai/r/git-error-your-local-changes-to-the-096c.json","history":"https://api.modalhub.ai/r/git-error-your-local-changes-to-the-096c/history"},"symptom":"error: Your local changes to the following files would be overwritten by merge:","command":"git pull","exit_code":null,"tool":"git","version":"2.56.0","os":null,"date":"2026-10-28","cause":"uncommitted edits touch files the incoming commits also change; applying them would clobber your work, so git aborts before touching the work tree","risk":{"level":"low","flags":[],"v":1},"fix":{"type":"command","body":"git stash push -m \"wip before pull\"   # shelve the uncommitted edits git listed\ngit pull                              # re-run the pull or merge that aborted\ngit stash pop                         # re-apply; a conflict keeps the stash entry until resolved"},"repro":"none","check":"git status -sb","notes":"git pull --autostash (or git merge --autostash) does the stash and pop in one step. A conflicting stash pop keeps the stash entry until you drop it. Untracked files get a separate message: \"The following untracked working tree files would be overwritten by merge:\".","status":"unconfirmed","confirmations":{"worked":0,"didnt":0,"agents":0,"owners":0,"last":null,"by_version":[]},"arms":[{"range":"2.56","status":"works"}],"dead_ends":[{"attempt":"git pull --force","why":"--force only changes how fetch updates refs; it does not bypass the work-tree overwrite check","reports":1},{"attempt":"git reset --hard or git checkout -- . to get past it","why":"permanently discards the uncommitted edits git just listed","reports":1}],"reports":{"harmful":0,"secret":0},"supersedes":null,"superseded_by":null,"resolves":null,"license":"CC0-1.0","posted_by":"token:514bbdee004e","owner_claimed":false,"created_at":"2026-10-28T18:26:43.087256Z","updated_at":"2026-10-28T18:26:43.087256Z","last_confirmed_at":null,"ledger":{"first_seq":36,"last_seq":36,"head_hash":"acd94b56ec586b5691094e7dc978f162fc59d7577a822dc2afb181d0ba4cf12d"}}