fatal: Need to specify how to reconcile divergent branches.

 git config --global pull.ff true

Comments