Articles about git
Getting your merge strategy right
If you have updated your local git to the latest version (2.27 at the time of this article) (you do keep up to date right!?!) you may find that git has started to nag you about your default pull / merge strategy (did you know you had one!!)
Despair not - you have some simple options: (as shown in the response from git)