Git New Added 9 September 2026

git: Your local changes to the following files would be overwritten by merge

Git is protecting uncommitted work in files the incoming commits also touch, so nothing has been merged yet. When the listed files are ones you never edited, the cause is usually a line ending or file mode difference the working tree recorded on checkout rather than an edit of yours.

Quick fix

Read the commands before running them. Anything that restarts a service, deletes data or changes permissions should be tried on a non-production system first.

Quick fix

# What is actually modified?
git status --short
git diff --stat

# Park the work, pull, put it back
git stash push -m "wip"
git pull
git stash pop

# Or commit it on a branch, which is harder to forget than a stash
git switch -c wip && git commit -am "wip"

# Files you never touched: look for mode or line ending noise
git diff | head -20
git config core.fileMode false
git config core.autocrlf input      # on Linux and macOS

# Genuinely disposable local edits
git checkout -- path/to/file

How to diagnose Git errors

Git errors are frightening mostly because the messages describe internal state rather than what to do. The reassuring fact is that almost nothing is lost: git reflog records every position HEAD has held, so a bad rebase, a hard reset or a deleted branch is nearly always recoverable. Before running any destructive command, note the current commit hash.

If the quick fix above does not resolve it, work through these steps. They apply to this whole class of error, not just to this one message, which is usually what saves the time.

Run git status and read it fully. It tells you the current state and usually names the exact command to move forward or abort.
Use git reflog to find any commit you think you have lost, then git reset --hard <hash> or git branch recovery <hash> to get it back.
For a rejected push, run git fetch then git log --oneline HEAD..@{u} to see exactly what is on the remote that you do not have. Prefer --force-with-lease over --force, which refuses to overwrite work you have not seen.
Abort rather than improvise when a merge or rebase goes wrong: git merge --abort, git rebase --abort, git cherry-pick --abort.
For repository corruption, run git fsck --full. If objects are missing, re-cloning and cherry-picking your local work is usually faster and safer than repairing in place.

Tools worth reaching for

git status
git reflog
git fsck --full
git log --graph --oneline --all
git diff --check

Authoritative references

Primary documentation for this error, worth reading before applying any fix in production.

git-scm.com

Related Git errors

See all 20 Git errors →

Browse other categories

Something missing or wrong?

This entry is maintained by hand. If the fix is out of date, incomplete, or you have a better one, email a correction and it will be reviewed.