|
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 22:09:39 +0300 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
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?
Note that vc-git-resolve-when-done has to work satisfactorily both after vc-git-stash-apply, and after 'git stash apply' performed in console.
[Prev in Thread] | Current Thread | [Next in Thread] |