[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [egit-dev] rebase always fails
|
2012/1/12 Markus Duft
<markus.duft@xxxxxxxxxx>
Hi!
how can i find out more about why a rebase fails in the UI? i have a branch which i reproducibly can't rebase on origin/master. it starts working, tells me that it rewinds HEAD, starts applying and the just "Aborting rebase ..." and after that only a "Rebase failed" message with no further information. doing the rebase on the command line works.
i can debug if that's required to get more info, as i'm using a current git version of egit and jgit :)
most probably your commit graph is too complex to be handled by the
resolve merge strategy used internally by jgit's rebase implementation.
Try the same rebase using the resolve merge strategy from c-git, if this
also fails the restricted capabilities of the resolve strategy are most
probably the reason why EGit fails to handle this rebase. The recursive
strategy isn't yet implemented in jgit
git rebase --strategy resolve [<upstream>] [<branch>]
--
Matthias
