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)

1. git config pull.rebase false (the current default) - set this and you have the same behaviour as before
2. git config pull.rebase true - rebase the changes (probably the best option for those that know what is going on…) (and if you really want a detailed explanation of why you should do this https://blog.developer.atlassian.com/stop-foxtrots-now/)
3. git config pull.ff only - simplest and what this post recommends https://blog.sffc.xyz/post/185195398930/why-you-should-use-git-pull-ff-only

You can also add --global to your choice to set it for all of your repos (not a lot more info in this post than is in the message git gives really).