如果在未来得到这个git错误，这个解决方案将帮助你

从(development/master/main)导入到本地分支时出现错误: 错误信息:

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.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 --re base, --no-re base, 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配置文件并添加这一行 1)(拉) Ff = no 如果第一步对你不起作用，那么就应用第二步

2)git pull -ff-only或git config -global pull。ff只

如果在未来得到这个git错误，这个解决方案将帮助你

从(development/master/main)导入到本地分支时出现错误: 错误信息:

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.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 --re base, --no-re base, 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配置文件并添加这一行 1)(拉) Ff = no 如果第一步对你不起作用，那么就应用第二步

2)git pull -ff-only或git config -global pull。ff只

对我来说，这是有效的，改变branch_name与实际的分支:

git pull origin branch_name --no-ff

你的分支不再直接基于你试图合并到的分支——例如，另一个提交被添加到目标分支，而这个分支并不在你的分支中。因此，您不能快进到它(因为快进要求您的分支完全包含目标分支)。

你可以在目标分支的基础上重新建立你的分支(git rebase <destination branch>)来重新提交，这样它们就会快速前进到目标分支中，或者你可以做一个常规的合并。

如果您在本地分支上执行git pull origin master时遇到此情况，请在记事本中打开.gitconfig(通常隐藏在C:\Users\Myname中)并添加这两行

[pull]
    ff = no

保存配置并再次尝试git pull origin master

您可以在终端上尝试这一点，它实际上编辑您的<。Gitconfig >文件并设置ff = no

git config pull.ff no