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

From: Dmitry Gutov <[email-masked]>
Date: Thu, 14 May 2015 21:48:21 +0300

On 05/14/2015 09:36 PM, Eli Zaretskii wrote:

> So: do we have a way of knowing which files had their changes stashed?

I don't think so. Further, like I mentioned before, the user might have 
staged some further changes to those other, non-conflicting files.

Do you apply stashes via the vc-dir interface? We could do something in 
that implementation.