[petsc-dev] rebase problem

[Mark Adams]

I am doing a rebase -i to squash commits and even if I do nothing git tris
to apply about 7) commits, but starts to fail at #41 and if I try to --skip
it it starts failing on every one. The error message is not very useful to
me:

15:15 adams/landau-gpu-assembly> ~/petsc$ git rebase -i HEAD~5
error: could not apply a8e4255... Add test of PCASMSetSubMatType with
nonlinear problem

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase
--abort".
Could not apply a8e4255... Add test of PCASMSetSubMatType with nonlinear
problem

Any ideas?  Maybe rebase over master first?

Thanks,
Mark
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20201206/5e490849/attachment.html>