I believe you can set the default to be --ff-only then you only need to specify if you want to merge. Despite knowing this is an option it's still hard for me

I believe you can set the default to be --ff-only then you only need to specify if you want to merge. Despite knowing this is an option it's still hard for me to find decent documentation, but I think this is probably the best I found: https://salferrarello.com/git-warning-pulling-without-specifying-how-to-reconcile-divergent-branches-is-discouraged/ https://salferrarello.com/git-warning-pulling-without-specif...