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

[Basil L. Contovounesios]

David De La Harpe Golden <david@harpegolden.net> writes:

> maybe I'm paranoid but in general using git, I tend to only do "git pull
> --ff-only" (or rather, I default to it in my .gitconfig) and if that errors 
> out
> I always just fall back to a git fetch / <inspect situation> / git merge, see
> also e.g.
>
> https://blog.sffc.xyz/post/185195398930/why-you-should-use-git-pull-ff-only

Am I the only one who prefers doing separate 'git fetch' and 'git
merge/rebase' operations, and never uses 'git pull'? :)

This way I get to see exactly what's changed upstream, whether it
conflicts with my local changes, decide whether I want/need to
merge/rebase, etc. etc.

-- 
Basil