Subject: Re: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file

From: Eli Zaretskii <[email-masked]>
Date: Wed, 13 May 2015 19:20:39 +0300

> From: Stefan Monnier <[email-masked]>
> Cc: Eli Zaretskii <[email-masked]>,  [email-masked],  [email-masked]
> Date: Wed, 13 May 2015 09:04:16 -0400
> 
> > What shall we do? Unstage the automatically-staged files? Revert the changes
> > from this bug? It seems Git really wants the changes staged after the
> > conflict resolution.
> 
> IOW, the "resolve" step should always just use "git add", like we used
> to do.

How is that TRT when the original state was that there were
uncommitted and unstaged changes?  Running "git add" would confuse
people who are not very knowledgeable about the index.  If they _are_
knowledgeable, they'll "git reset" right away anyway.

So please don't go back.