Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

> Cc: larsi@gnus.org, emacs-devel@gnu.org
> From: Paul Eggert <eggert@cs.ucla.edu>
> Date: Mon, 17 Aug 2020 09:11:21 -0700
> 
> I avoid the problem by never committing anything to my local copy of the 
> master 
> branch unless I immediately push the result. Very occasionally someone else 
> is 
> committing at the same time so my push fails; in that case I delete my master 
> branch, re-create it from upstream, and start over. So when I do "git pull" I 
> never need to rebase and I never need to merge. This is cleaner and simpler 
> than 
> the alternatives, at least for me.

Yes, avoiding the need for this is better, but we are only human...

We decided long ago that doing an automatic merge during "pull" is
okay, so these rare incidents are not serious enough to worry about.