如何解决“多个合并基地” EGit Eclipse插件中的错误？ [英] How to work around "multiple merge bases" error in EGit Eclipse plugin?

问题描述

使用eclipse egit插件我遇到了多个合并基础异常。
在我设法解决问题之前，这次没有任何帮助。
即使创建额外的提交和分支，樱桃选择。存储库分支似乎被阻止合并。

Using eclipse egit plugin I've encountered "multiple merge bases" exception. Before I've managed to resolve the situation, but this time nothing helps. Even after creating additional commits and branches, cherry pick. Repository branches seems blocked to merge.

这是例外：

An internal error occurred during: "Merging with refs/remotes/origin/master".
Exception caught during execution of merge command. java.io.IOException: Multiple merge bases for:
 082a3a9846147a0e6df72d6cffa6d6e517275b7b
 4d6c573c52ebb0de091bd91dbcefcbcbd44e7534 found:
 c480f2b3683a5d0c5607984ea6393d61dfa9fba4
 9da20a3c6304059ed92296ef2decb6f04e7112df

推荐答案

EGit

需要这种递归合并策略是从EGit开始的默认3.0（请参阅错误380314 ）。

如果您使用的是旧版本，请参阅下载页面进行升级

In case you are using an older version, see the download page for upgrading.

或者，在进行最后一次合并之前，尝试重新设置为上次本地提交，然后与 origin / master 合并。然后，如果您在原始合并之上进行更多更改，请选择这些。

Alternatively, try resetting to your last local commit before you made the last merge, and then merge with origin/master. Then if you made more changes on top of the original merge, cherry-pick these.

另一种可能性是使用C git（在控制台上）进行合并，它可以处理这种情况。

Another possibility would be to do the merge using C git (on the console), it can handle that situation.

这篇关于如何解决“多个合并基地” EGit Eclipse插件中的错误？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！