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

From: Eli Zaretskii <[email-masked]>
Date: Thu, 23 Apr 2015 00:32:06 +0300

> Date: Wed, 22 Apr 2015 15:59:46 -0400
> From: Richard Stallman <[email-masked]>
> CC: [email-masked], [email-masked], [email-masked]
> 
>   > The one thing to remember is that after saving the file whose
>   > conflicts were resolved, you should type "C-x v v" to commit it in the
>   > first case, and do nothing in the second.
> 
> Does VC determine automatically whether the conflict was due to merge
> or due to git stash pop,
> or do you tell VC by doing C-x v v in the first case and nothing
> in the second case?

It determines automatically.  It has to, because what it does when you
save the file already depends on that.  When you type "C-x v v" after
saving it, it's too late.