git - How to work around "multiple merge bases" error in EGit Eclipse plugin?

Question

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.

This is the exception:

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

Answer 1

EGit

The recursive merge strategy needed for this is the default since EGit 3.0 (see bug 380314).

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

Workarounds

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.

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