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: Mon, 20 Apr 2015 22:23:08 +0300

> From: Stefan Monnier <address@hidden>
> Cc: address@hidden,  address@hidden,  address@hidden
> Date: Mon, 20 Apr 2015 15:20:28 -0400
> 
> > If it is safe to issue this command automatically, we could do
> > that in the case of "stash pop" conflict _instead_ of doing "git add"
> > in the "normal" merge-conflict case.
> 
> I don't really know what is "safe" in this respect.  For my own use, all
> of the options we've considered are safe.

Then my vote is for using "git add FILE" with conflicts during a
merge, and "git reset HEAD FILE" with conflicts during "stash pop".  I
think this is the simplest solution and is easy to implement with
minimal changes.





reply via email to

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