[petsc-dev] strangness in Chebyshev estimate of eigenvalues

[Mark Adams]

On Wed, May 25, 2016 at 8:00 AM, Jed Brown <jed at jedbrown.org> wrote:

> Mark Adams <mfadams at lbl.gov> writes:
> > FYI, I get this error from rebasing. I will look into what they suggest.
>
> What command did you use to rebase?
>

git rebase master


>
> I ran "git rebase master" and fixed one trivial conflict in a makefile.
> The result is in 'jed/mark/snes-ex56c' if you want to check it out.
>

thanks, got it.

>
> > warning: squelched 32 whitespace errors
> > warning: 37 lines add whitespace errors.
> > Falling back to patching base and 3-way merge...
> > Auto-merging config/builder.py
> > CONFLICT (content): Merge conflict in config/builder.py
> > error: Failed to merge in the changes.
> > Patch failed at 0029 Adding tests for dmplex adaptation
> > The copy of the patch that failed is found in: .git/rebase-apply/patch
> > 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".
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20160525/f47f9e3e/attachment.html>