Re: Problem with git push

[Phil Holmes]

----- Original Message ----- 
From: "David Kastrup" <address@hidden>
To: <address@hidden>
Sent: Thursday, September 22, 2011 12:56 PM
Subject: Re: Problem with git push


> "Phil Holmes" <address@hidden> writes:
>
> > ----- Original Message ----- 
> > From: "Phil Holmes" <address@hidden>
> > To: "Devel" <address@hidden>
> > Sent: Thursday, September 22, 2011 12:44 PM
> > Subject: Problem with git push
> >
> >
> > > On my new machine, I get:
> > >
> > > address@hidden:~/lilypond-git$ git push --dry-run
> > > To ssh://address@hidden/srv/git/lilypond.git
> > > ! [rejected]        master -> master (non-fast-forward)
> > > error: failed to push some refs to
> > > ssh://address@hidden/srv/git/lilypond.git'
> > > To prevent you from losing history, non-fast-forward updates were 
> > > rejected
> > > Merge the remote changes before pushing again.  See the 'Note about
> > > fast-forwards' section of 'git push --help' for details.
> > > address@hidden:~/lilypond-git$
> > >
> > > I did "See the 'Note about fast-forwards' section of 'git push
> > > --help' " but it didn't help me at all.  Could anyone point me to
> > > what the problem is and how to fix it, please?
> > >
> > > --
> > > Phil Holmes
> >
> >
> > Same problem on my VM, so I think it's either the status of git, or my
> > username - not anything machine specific.
> >
> > I was getting the same problem last night.
>
> git pull -r
>
> Maybe even explicitly
>
> git rebase origin
>
> --
> David Kastrup


Thanks, but I get the same after that.

--
Phil Holmes