deadbeef

Git拒绝合并基础上无关的历史记录

♀尐吖头ヾ 提交于 2020-08-16 04:25:09
问题: During git rebase origin/development the following error message is shown from Git: 在 git rebase origin/development 过程中,Git显示以下错误消息: fatal: refusing to merge unrelated histories Error redoing merge 1234deadbeef1234deadbeef My Git version is 2.9.0. 我的Git版本是2.9.0。 It used to work fine in the previous version. 以前在以前的版本中可以正常工作。 How can I continue this rebase allowing unrelated histories with the forced flag introduced in the new release? 如何在新版本中引入强制标记的情况下继续进行此基础更改,以允许不相关的历史记录? 解决方案: 参考一: https://stackoom.com/question/2ZBOy/Git拒绝合并基础上无关的历史记录 参考二: https://oldbug.net/q/2ZBOy/Git-refusing-to-merge