2011/9/22 Phil Holmes <m...@philholmes.net>: > I've just used lily-git to do a hard reset of my git, reapplied the changes, > recommitted and redone the push --dry-run and am still getting the same > error. I'm not quite sure what it means for "commit you want to push must > follow origin/master" but it's definitely the sole commit which is on the > latest version of master.
Doesn't "To prevent you from losing history, non-fast-forward updates were rejected..." after pull -r mean that there is some conflict and that your commit cannot be applied to master? (i don't know how pull -r would succeed if that was the case, but...) cheers, Janek _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
