Fix git pull error "Need to specify how to reconcile divergent branches", "Not possible to fast-forward, aborting"
By MinK at Nov 12 2023