[petsc-dev] rebase problem

[Mark Adams]

This is the status after the first fail. I have nothing to do with these
files. There are diffs, but I don't know anything about them.

Maybe I should skip failures (lot of them) and then checkout the conflicted
files from master, then rebase over master?

Thanks,
Mark


6:24 1 adams/landau-gpu-assembly *+|REBASE-i 41/76 ~/petsc$ git status -uno
# HEAD detached from 564e279
# You are currently rebasing branch 'adams/landau-gpu-assembly' on
'0c5056a'.
#   (fix conflicts and then run "git rebase --continue")
#   (use "git rebase --skip" to skip this patch)
#   (use "git rebase --abort" to check out the original branch)
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
# new file:   src/snes/tutorials/output/ex19_asm_matconvert.out
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
# both modified:      src/snes/tutorials/ex19.c
#
# Untracked files not listed (use -u option to show untracked files)
16:25 adams/landau-gpu-assembly *+|REBASE-i 41/76 ~/petsc$

On Sun, Dec 6, 2020 at 3:48 PM Jacob Faibussowitsch <jacob.fai at gmail.com>
wrote:

> Mark,
>
> What is the output of git status when it fails? Any files that are marked
> staged/uncommitted?
>
> I’ve found that rebase will only work out of the box if your branch
> history is completely linear, i.e. no merge commits in between. If there
> are merge commits then git is not always able to resolve them. If this is
> the case then when the rebase fails at some commit some of the files will
> be staged with the changes from both commits that you must __manually__
> reconcile.
>
> Best regards,
>
> Jacob Faibussowitsch
> (Jacob Fai - booss - oh - vitch)
> Cell: (312) 694-3391
>
> On Dec 6, 2020, at 14:22, Mark Adams <mfadams at lbl.gov> wrote:
>
> 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/34dba1ca/attachment.html>