From: Pretty Boy Floyd <boxerab@gmail.com>
Date: Fri, 15 Oct 2010 20:13:27 GMT
Subject: Git Stash stages files if there is a conflict
Message-ID: <loom.20101015T220924-952@post.gmane.org>

Hello!

I am running msysgit 1.7.3.1.  If I run stash apply, and there is a conflict,
all of my stash changes get staged. Is this the correct behaviour? I found it a
little surprising.

Another question: if I have stashed 10 files, and there is a conflict in one of
them, will stash apply abort when it has a conflict, or will it apply all
non-conflicted files.


Finally, if I do the following:

git stash
git pull
git stash apply

and another developer has removed a file that I have stashed, then I am unable
to apply the stash  on this file. How can I retrieve my changes from the stash?


Thanks!