|
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 23:24:34 +0300 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
On 05/14/2015 10:33 PM, Eli Zaretskii wrote:
Ask the user whether to reset each file in the index (other than the one in which the conflicts were resolved), perhaps?
That doesn't sound to me like something an after-save-hook should do.And we can't reset each other file, we'd first have to check whether some of them still conflicts.
[Prev in Thread] | Current Thread | [Next in Thread] |