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 22:09:39 +0300
> 
> On 05/14/2015 09:52 PM, Eli Zaretskii wrote:
> 
> > I think its a good idea.
> 
> It might be. But I don't actually know how to approach it.
> 
> Doing 'git reset' right after a stash is popped would break 
> vc-git-conflicted-files.
> 
> If we don't do that, then what else *do* we do in vc-git-stash-apply and 
> vc-git-stash-pop?

Ask the user whether to reset each file in the index (other than the
one in which the conflicts were resolved), perhaps?