[petsc-dev] strangness in Chebyshev estimate of eigenvalues

[Satish Balay]

On Fri, 27 May 2016, Mark Adams wrote:

> >
> > Satish, please don't use this syntax for force pushes.  Prefer
> >
> >  git push origin +mark/snes-ex65c
> >
> 
> 08:13 mark/snes-ex56c<> ~/Codes/petsc$ git push origin +mark/snes-ex65c
> error: src refspec mark/snes-ex65c does not match any.
> error: failed to push some refs to 'git at bitbucket.org:petsc/petsc.git'

I have no idea why you got this error.
> 
> FYI, I then tried to pull (again) to remove this "<":
> 
> 08:16 1 mark/snes-ex56c<> ~/Codes/petsc$ git pull origin mark/snes-ex56c

I've mentioned this earlier - you shouldn't be trying random stuff
after rebase. For sure this merge is not the correct thing to do..

Its probably better if you nuke your copy of this branch - and restart..

git reset --hard
git checkout master
git branch -D mark/snes-ex56c
git co mark/snes-ex56c

And perhaps the 'rebase/squash' is not worth this much trouble..

Satish

> From bitbucket.org:petsc/petsc
>  * branch            mark/snes-ex56c -> FETCH_HEAD
> Merge made by the 'recursive' strategy.
> 
> This was a merge. then tried again w/o luck:
> 
> 08:17 mark/snes-ex56c> ~/Codes/petsc$ git push origin +mark/snes-ex65c
> error: src refspec mark/snes-ex65c does not match any.
> error: failed to push some refs to 'git at bitbucket.org:petsc/petsc.git'
> 
> 
> > This is to avoid people with old versions of Git or a weird push.default
> > settings from obliterating other branches.
> >
>