Re: Stupid git!

[Eli Zaretskii]

> Date: Mon, 14 Sep 2015 11:09:20 +0000
> Cc: Eli Zaretskii <address@hidden>, address@hidden, address@hidden
> From: Alan Mackenzie <address@hidden>
> 
> > The merge commit is *supposed to* include all the changes that have been 
> > merged in. If you take it upon yourself to remove those changes from the 
> > staging area, as a result Emacs won't include them, and it won't be 
> > obvious to most of the people who read emacs-diffs, and then someone 
> > will have to find out the hard way that something's missing.
> 
> OK, I've got it now.  For some reason, git choses to abort the merge,
> despite there being no conflicts between the changes from upstream and
> the changes I've committed locally - indeed, to complete the merge is a
> fully mechanical action, `git commit'.  This seeming illogicality is
> what confused me in the first place.

I think this was because you did a "git add" before pulling.  But I'm
not sure.  (I almost never use "git add", except when adding new
files.)