git remove file from stash

Question

A stash is a commit (or really, two or even sometimes three commits) and you cannot change a commit. The literal answer to your question, then, is "you can't". Fortunately, you don't need to.

You say you can't apply your stash because of a conflicting file. But you can apply it, you just get a merge conflict. All you need to do is resolve the merge conflict.

Let's say the conflict is in file README.txt, just so there's something to write about here.

If you want to resolve it by keeping the on-branch version, apply the stash, then check out the on-branch version to resolve the conflict:

git stash apply
git checkout --ours -- README.txt  # or git checkout HEAD -- README.txt

If you want to keep the in-stash version, extract that one:

git checkout --theirs -- README.txt # or git checkout stash -- README.txt

Or, use any old merge resolution tool (I just use a text editor), and then "git add" the result.

Once you are all done with the stash, git stash drop will "forget" the commits that make up the stash. (Don't do this until you are sure you are done with it; it's very hard to get it back afterward.)

There is a workaround for this situation:

1. save your stash as a patch file:

   $ git stash show -p > stash.patch
   

2. apply this patch, skipping the conflicts (you will be asked for resolution of conflicts, just skip missing files):

   $ patch -p1 < stash.patch
   

Don't forget to clean up stash.patch afterwards!

1. Stash your uncommitted changes.
2. Apply your original stash
3. Discard the file
4. 4 Apply the stash containing your uncommitted changes.