How to fix error: Your local changes to the following files would be overwritten by merge in Git

GitBEGINNERLOW

This error occurs when running git stash apply or git stash pop, and Git detects uncommitted local changes that conflict with the stashed changes. Git refuses to proceed to prevent data loss.

What this error means

When you run `git stash apply` or `git stash pop`, Git attempts to merge the stashed changes back into your working directory. However, if you have uncommitted modifications to files that are also modified in the stash, Git cannot safely merge them without potentially overwriting your current work. This is a safety mechanism. Git is telling you that applying the stash would overwrite uncommitted changes in your working directory. Rather than silently destroying your work, Git stops and asks you to deal with the conflicting changes first. The error typically appears when you stashed some changes, then made additional modifications to the same files (or received them via pull/checkout), and now want to restore your stash. Git sees that both your current working directory and the stash have changes to the same files, and it cannot automatically reconcile them.

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

1Stage your current changes first

The simplest solution is to stage your current changes, which allows git stash apply to proceed:

bash

# Stage all current changes
git add .

# Now apply the stash
git stash apply

# Unstage if you don't want to commit yet
git reset HEAD

This works because staging moves your changes to the index, giving Git a clean working tree to apply the stash to.

2Commit your current changes

If your current changes are ready to be committed, commit them first:

bash

# Commit current work
git add .
git commit -m "WIP: save current progress"

# Apply the stash
git stash apply

# Optional: reset the WIP commit but keep changes
git reset --soft HEAD~1

This preserves both sets of changes and lets you decide how to combine them.

3Discard current changes if not needed

If your current uncommitted changes are not important, you can discard them:

bash

# WARNING: This permanently discards uncommitted changes
git checkout .

# Now apply the stash
git stash apply

Caution: Only use this if you are certain you don't need your current changes. This action cannot be undone.

4Create a branch from the stash

Use git stash branch to create a new branch with your stashed changes applied cleanly:

bash

# Create a new branch from the stash
git stash branch my-stashed-work

# This creates a branch at the commit where you originally stashed,
# applies the stash, and drops it from the stash list

This is especially useful when your current branch has diverged significantly from when you created the stash.

5Force apply using patch

As a last resort, you can force the stash to apply using a patch:

bash

# Show stash as a patch and apply it
git stash show -p | git apply

# Or with the 3-way merge option for conflict markers
git stash show -p | git apply --3way

The --3way option will create conflict markers in files where automatic merge isn't possible, allowing you to resolve conflicts manually.

How to fix error: Your local changes to the following files would be overwritten by merge in Git

What this error means

Typical symptoms

Common causes

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

Advanced notes

Related errors

Official resources & further reading