changes overwritten 🌿 Git

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.

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

  1. Commit your changes, then pull
  2. Or stash: git stash && git pull && git stash pop
  3. Discard if not needed: git restore <file>

Detailed fix by platform

Git

  1. git stash push -m "wip" && git pull --rebase && git stash pop

How to diagnose

  1. Files — Which files are listed?
  2. Intent — Keep or discard the changes?

🧠 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.