Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Dmitry Gutov]

On 05/28/2015 06:52 PM, Michael Albinus wrote:

> The other files I've simply reverted in
> Emacs' vc-dir buffer, via "C-x v u", IIRC.

Yeah, you shouldn't have done that. When you're merging the upstream 
into the current branch, and there's a conflict, it stages all new 
changes that apply without conflicts and asks you to resolve the 
conflicts in the rest of files (and stage them too).

Reverting any of the already staged files means you remove those changes 
from the tree the merge will result in.