"Phil Holmes" <m...@philholmes.net> writes: > ----- Original Message ----- > From: "Phil Holmes" <em...@philholmes.net> > To: "Devel" <lilypond-devel@gnu.org> > Sent: Thursday, September 22, 2011 12:44 PM > Subject: Problem with git push > > >> On my new machine, I get: >> >> phil@Ubuntu:~/lilypond-git$ git push --dry-run >> To ssh://philhol...@git.sv.gnu.org/srv/git/lilypond.git >> ! [rejected] master -> master (non-fast-forward) >> error: failed to push some refs to >> ssh://philhol...@git.sv.gnu.org/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. >> phil@Ubuntu:~/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 _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
