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

[Paul Eggert]

On 8/17/20 8:58 AM, Eli Zaretskii wrote:
> No, please try to avoid using "pull --rebase".  It can have bad
> consequences in some corner cases.  Just "pull" is TRT

Yes, "pull --rebase" causes more trouble than it cures.

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.