Git issue while taking Pull:
You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull
Solution:
Run the following command to fix it:
git config pull.rebase false