bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file

[Eli Zaretskii]

> Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org
> From: Dmitry Gutov <dgutov@yandex.ru>
> Date: Thu, 14 May 2015 21:00:36 +0300
> 
> > If we know all the stashed files, how about invoking "git reset" for
> > all of them?  It cannot hurt, can it?
> 
> How will we know it? Emacs could try to list all staged files, but
> there's no good way to know that they all belong to the applied
> stash (looking at the top stash isn't reliable either: the user
> might have specified a different one explicitly).

We could assume that any staged file during resolution of conflict due
to "stash pop" is from the stash.  If that's too dangerous (is it?),
we could ask for confirmation.