What are the cryptic error messages? The only one that I know if is the message stating that the commit is empty ... In that case simple use git rebase --skip

What are the cryptic error messages? The only one that I know if is the message stating that the commit is empty ... In that case simple use git rebase --skip, to skip applying that patch. That tends to happen when after you fix the "merge" conflict after replaying a patch and the changeset is empty.