Git Reconcile Divergent Branches

Fix git local branch reconcile warning.

Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull

Pull the remote branch with the –ff-only flag.

git pull  --ff-only

Add –ff-only pull option in the global config.

git config --global pull.ff only

Thread: how-to-deal-with-this-git-warning-pulling-without-specifying-how-to-reconcile