|
| From: | Dmitry Gutov |
| Subject: | bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file |
| Date: | Thu, 14 May 2015 21:48:21 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
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.
| [Prev in Thread] | Current Thread | [Next in Thread] |