Re: Understanding a recent commit in emacs-25 branch [ed19f2]

[Ingo Lohmar]

Hi Alan,

On Sun, Apr 03 2016 11:17 (+0000), Alan Mackenzie wrote:

> That massive commit happened because of git.  I attempted a 'git pull'
> prior to making a (moderately small) commit.  There was a one-letter
> typo in one of my existing files (which I think had been committed).
> Because of that, git failed to merge in all the stuff which it had just
> fetched from savannah, instead prompting me to do a manual merge, which
> I then did.

I think 'git pull' has been discussed on this list before.  Others feel
differently about this issue, but I strongly advise anyone against using
'git pull', and instead suggest you do 'git fetch' (maybe --all).

*After* seeing what has happened to the remote branches, you can decide
whether a merge or a rebase is in order.  Or you spot an unwanted
discrepancy, and can fix it, instead of git telling you to manually
merge (although admittedly I do not quite follow that part).

> It would also be nice if such "pseudo merges" could be handled locally,
> rather than being pushed back to the remote repository, causing
> confusion.

Please note that *all* commits and merges happen locally.  The user can
only push changes back to the remote by an explicit action, with all
intended and unintended effects.