From https://gitee.com/baiboystu/spring-mvc-test * branch master -> FETCH_HEAD 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.

这个错误提示说明你的本地分支和远程分支有分叉，并且需要指定如何合并它们。具体来说，你需要在拉取之前指定一个合并策略，可以通过以下命令来完成：

1. 合并策略为merge：`git config pull.rebase false`
2. 合并策略为rebase：`git config pull.rebase true`
3. 合并策略为fast-forward only：`git config pull.ff only`

如果你想要在所有仓库中使用相同的合并策略，可以在命令中加上`--global`参数。另外，如果你只想在当前拉取操作中使用特定的合并策略，可以在命令中加上`--rebase`、`--no-rebase`或`--ff-only`参数来覆盖默认设置。