报错信息
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 pull --rebase origin dev
// 拷贝远程分支代码
git push origin dev