On Tue, May 31, 2011 at 05:43, Akos Tajti <akos.tajti@xxxxxxxxx
> I wrote a method that merges the changes from a fork to its parent. It works
> in most of the cases. However, my last merge caused an exception.
> java.io.IOException: Multiple merge bases for:
Yup, that's what that is.
It still doesn't.
>. As Shawn wrote in the discussion JGit doesn't support executing
> these kind of merges. But this was two years ago, so I'd like to aks you if
> this problem were fixed?
We are still missing an implementation that merges the merge bases
> If not, do you know about any workaround? We'd like
> to support a workflow that can lead to many criss-cross merges. Is there a
> way to merge them using JGit? (for example creating the merge base by
> merging the multiple bases, or using an oother MErger implementation)
together to create a new virtual merge base. And we welcome