error: Your local changes to the following files would be overwritten by merge
git pull/merge would modify files you’ve changed but not committed.
Exact message you may see
would be overwritten by mergePlease commit your changes or stash them before you merge
Seen on:
Git
Meaning
Git refuses to clobber uncommitted work. Commit, stash or discard the changes first.
Common causes
- Uncommitted edits to files changed upstream
- Generated files tracked in git (build output, lockfiles)
- Line-ending normalisation changes
⚡ Quick fix
- Commit your changes, then pull
- Or stash: git stash && git pull && git stash pop
- Discard if not needed: git restore <file>
Detailed fix by platform
Git
git stash push -m "wip" && git pull --rebase && git stash pop
How to diagnose
- Files — Which files are listed?
- Intent — Keep or discard the changes?
🔧 Still not fixed?
Many errors look alike. If the steps above didn’t solve it, one of these is probably what you’re facing:
Similar errors
Most viewed in Git
- Git SSL certificate problem fatal: unable to access 'https://…': SSL certificate problem: unable to get local issuer certificate
- rebase in progress fatal: It seems that there is already a rebase-merge directory, and I wonder if you are in the middle of another rebase.
- kex_exchange_identification kex_exchange_identification: Connection closed by remote host
Other ways to find it
Where this error sits
Origin: Build & delivery. Errors that are often confused with or caused by this one (click to open):
🧠 Still stuck? Analyze your error
Paste the full message, response headers or stack trace — we'll detect the platform and point to the most likely cause.
💬 What worked for others
No tips yet — did something else fix this for you?
Share what worked for you
Tips are checked by an editor before they appear. Links are removed.
Did this fix work for you?
Report a correction or suggest an improvement
Last updated 12 Oct 2026