git 'error: Your local changes to the following files would be overwritten by merge' (also on pull or checkout): how do I proceed without losing work?

Cause: you have uncommitted modifications in files that the merge, pull or checkout also needs to change. Git stops before touching anything so your edits are not lost. Non-overlapping local changes are normally preserved, which is why this error only names specific files. Fix (best first): 1. Keep the work as a commit: git add <files>, git commit -m "wip", then repeat the pull or merge. Resolve any conflicts normally. 2. Or park it with a stash: git stash push -m "before pull", run the pull or merge, then git stash pop. If pop hits conflicts the stash entry is kept; resolve the files and run git stash drop yourself. Add -u if untracked files are involved. 3. One-off convenience: git pull --autostash (or git merge --autostash) stashes and reapplies for you, but the reapply can still conflict. 4. If you do not need the local edits to those files, discard them deliberately with git restore <file>. This permanently throws the changes away, so check git diff first. 5. If the message mentions untracked working tree files, move or delete those files (or stash with -u), since the incoming change wants to create them. Avoid reaching for git reset --hard or git checkout -f as a reflex; they delete uncommitted work for good. Verify: git status shows a clean tree before the merge, the merge or pull completes, and git stash list is empty (or contains only entries you meant to keep). Sources: https://git-scm.com/docs/git-merge https://git-scm.com/docs/git-stash