Pulling without specifying how to reconcile divergent branches is

The solution for this is noted below

git config pull.rebase false

Try other methods by searching on the site. That is if this doesn’t work