[petsc-dev] strangness in Chebyshev estimate of eigenvalues

[Satish Balay]

On Wed, 25 May 2016, Mark Adams wrote:

> On Wed, May 25, 2016 at 11:31 AM, Satish Balay <balay at mcs.anl.gov> wrote:
> 
> > Mark,
> >
> > To simplify - lets start over..
> >
> > - you delete your copy of mark/snes-ex56c, jed/mark/snes-ex56c
> >
> > i.e:
> > git rebase --abort
> > git reset --hard
> > git checkout master
> > git branch -D mark/snes-ex56c jed/mark/snes-ex56c
> >
> 
> done
> 
> 
> >
> > - Then I'll push to 'mark/snes-ex56c' [delete jed/mark/snes-ex56c on
> > server]
> >
> > - After I do my changes - you can start using mark/snes-ex56c


Ok - I've done a 'rebase master' and 'push -f' on mark/snes-ex56c

You might want to do:

git checkout mark/snes-ex56c
git rebase -i 7216b81e99debbb3a0e1c5dd0b26b0d24a8a5ac0

[Note: there is a difference between 'rebase -i master' and 'rebase -i
starting-commit-id'. For squashing commits - usually you want the second one]

And after you are done with rebase/squash - do: 'git push -f'

Note: do *not* do 'git pull' after a rebase. If at all someone else
pushed stuff during your 'rebase -i' to this branch - the appropriate
thing to do is 'git pull --rebase'

And always verify with 'git log master..mark/snes-ex56c' [since you
have a broken gitk :(]

Satish