hint: 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: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. fatal: Need to specify how to reconcile divergent branches.
# 查看本地和远程分支的差异
git log --oneline --graph --all -10
# 查看本地未推送的提交
git log origin/master..HEAD --oneline
git config pull.rebase true
git pull origin master
git config pull.rebase false
git pull origin master