[petsc-dev] git problem

[Satish Balay]

git pull
git push

should be fine [wrt workflow]

To reset HEAD to previous commit:

git reset --hard HEAD~1

Satish

On Wed, 26 Feb 2014, Barry Smith wrote:

> 
>    I know if I do this I will get yelled at!  So why does git suggest something that will get me yelled at, why doesn’t it suggest something that will make Jed happy? I’m serious 
> 
>    BTW: what the f am I suppose to do here.
> 
>    Barry
> 
> To git at bitbucket.org:petsc/petsc.git
>  ! [rejected]        next -> next (fetch first)
> error: failed to push some refs to 'git at bitbucket.org:petsc/petsc.git'
> hint: Updates were rejected because the remote contains work that you do
> hint: not have locally. This is usually caused by another repository pushing
> hint: to the same ref. You may want to first merge the remote changes (e.g.,
> hint: 'git pull') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> 
> 
> 
>