bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "


From: Eli Zaretskii
Subject: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file
Date: Fri, 15 May 2015 10:10:51 +0300

> Cc: address@hidden, address@hidden
> From: Dmitry Gutov <address@hidden>
> Date: Thu, 14 May 2015 23:24:34 +0300
> 
> 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.

Why not?

> And we can't reset each other file, we'd first have to check whether 
> some of them still conflicts.

Can we know that conflicts still exist?





reply via email to

[Prev in Thread] Current Thread [Next in Thread]