[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when
Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when dealing with a stash conflict
Mon, 20 Apr 2015 17:46:05 +0300
> From: Stefan Monnier <address@hidden>
> Date: Sun, 19 Apr 2015 22:48:24 -0400
> Cc: Dmitry Gutov <address@hidden>
> Actually, I think the above is too ad-hoc, testing `stashed' which is
> only tangentially related to the problem.
The bug was specifically about incorrect staging of stashed changes,
which were supposed to be left unstaged and uncommitted after
resolving the conflict. So I don't see how this is tangential to the
problem; AFAIU it _is_ the problem.
> Better would be for vc-git-resolve-when-done to check the status of the
> file and only `git add' it if it doesn't have anything staged yet.
Why should what we do with some file depend on whether there are other
changes staged? (Or maybe I don't understand what "it" means in this
> Or better yet, do the "mark as resolved" differently, which doesn't
> involved touching the "staging area". Not sure how to do that, but Git
> aficionados should be able to find some clever hack for that, involving
> less than 10 commands.
The way I know of is "git reset HEAD FILE". But is that safe in the
case in point?
Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when dealing with a stash conflict,
Eli Zaretskii <=