What does "Your local changes would be overwritten" mean?

You have uncommitted modifications in files that the operation needs to update. Git refuses to proceed because it would overwrite your work. This is a safety mechanism. Your changes are still intact.

What is the difference between stash and commit for fixing this?

Stash temporarily shelves your changes so you can restore them later with "git stash pop". Commit permanently saves them in the history. Use stash when your work is not ready to commit. Use commit when it represents a complete unit of work.

Will "git stash pop" cause conflicts?

It can. If the operation you ran after stashing modified the same files, popping the stash may produce merge conflicts. Resolve them by editing the file, removing conflict markers, and running "git add".

Can I force Git to overwrite my local changes?

Yes, but it is risky. "git checkout -f " or "git reset --hard" will discard all uncommitted changes permanently. Only use this if you are certain you do not need your local modifications.

How do I avoid this error in the future?

Commit or stash before pulling or switching branches. You can also use "git pull --autostash" which stashes automatically. Set it as default with "git config --global rebase.autoStash true".

Your local changes would be overwritten by merge

Git is protecting your uncommitted work. This error means you have unsaved changes in files that the operation needs to update. Here are three safe ways to fix it.

Learn Git with GitQuest See the fix

gitquest — enquête

Error explained

What this error means

When Git needs to update files that contain uncommitted changes, it refuses to proceed to protect your work. This is a safety mechanism, not a bug. You will see this during git pull, git checkout, or git merge.

gitquest — overwritten by merge

$git pull origin main

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

src/config.ts

Please commit your changes or stash them before you merge.

Aborting

gitquest — overwritten by checkout

$git checkout feature/dashboard

error: Your local changes to the following files would be overwritten by checkout:

src/config.ts

Please commit your changes or stash them before you switch branches.

Root causes

Why this happens

Pulling with uncommitted changes

You edited files locally but did not commit or stash them. When git pull tries to merge remote changes into those same files, Git blocks the operation to protect your work.

Switching branches with modified files

You have uncommitted changes in files that differ between branches. Git cannot switch without overwriting your modifications, so it stops and warns you.

Stash pop or apply conflicts

If you have modifications and try to apply a stash that touches the same files, Git warns that your current changes would be overwritten by the stash contents.

Three ways to fix it

How to fix it

Choose the option that fits your situation. Stashing is the safest when your work is not ready to be committed.

Option 1: Stash, operate, restore Recommended

gitquest — fix with git stash

# Stash changes, do the operation, restore them

$git stash

Saved working directory and index state WIP on main: a1b2c3d Latest commit

$git pull origin main

Updating a1b2c3d..e4f5g6h

$git stash pop

Dropped refs/stash@{0}

Option 2: Commit your work first

gitquest — fix with git commit

# Commit your work first, then do the operation

$git add src/config.ts

$git commit -m "Save work in progress on config"

[main f7g8h9i] Save work in progress on config

$git pull origin main

Already up to date.

Option 3: Discard local changes Destructive

gitquest — fix by discarding changes

# Discard local changes (WARNING: loses your work)

$git restore src/config.ts

# Older Git: git checkout -- src/config.ts

$git pull origin main

Updating a1b2c3d..e4f5g6h

Fast-forward

Best practices

How to prevent this error

Commit or stash before pulling

Always commit or stash before git pull or switching branches. Make this a habit and you'll never see this error again.

Use git pull --autostash

The --autostash flag stashes before pulling and restores after. Set as default: git config --global rebase.autoStash true.

Check git status first

Run git status before any branch operation. If you see modified files, commit, stash, or discard before proceeding.

Related commands

git stash

Temporarily save uncommitted changes

git checkout

Switch branches or restore files

git restore

Discard working directory changes

GitQuest is created by Anaïs (nouvelle fenêtre), web developer and head of education, specializing in tech training and digital accessibility.

Questions about this Git error

Stop guessing, start understanding Git

GitQuest teaches you Git through hands-on investigations and real-world scenarios. Learn to handle errors with confidence.

Start learning