git 错误收集
1. POST git-upload-pack (315 bytes) From https://gitee.com/project/project-name * branch dev -> FETCH_HEAD = [up to date] dev -> origin/dev
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. Need to specify how to reconcile divergent branches.解决方法：
执行 git config pull.rebase false
然后再拉取分支