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

From: Eli Zaretskii <[email-masked]>
Date: Sun, 19 Apr 2015 21:38:13 +0300

> Date: Sun, 19 Apr 2015 21:30:30 +0300
> From: Dmitry Gutov <[email-masked]>
> CC: [email-masked], [email-masked]
> 
> On 04/19/2015 09:25 PM, Eli Zaretskii wrote:
> 
> > If we can, yes.  If not, this is way out of scope of the bug report.
> 
> Do you like the solution in d35f2f482273a822df695202f4a3bf1a5e473e63?

IMO, it's too radical: there's no need to avoid turning on
smerge-mode, as it is useful for conflict resolution.  "git add" is
not run by smerge-mode, it is run by vc-git-resolve-when-done, so it
should be enough to avoid adding that to after-save-hook, I think.

Thanks.