Hi, as said here http://lilypond.1069038.n5.nabble.com/lilypond-not-working-when-compiled-against-guile-2-2-tt213540.html#a213599 I tried to update the branch dev/guile-v2-work, but failed so far.
I did: (1) the branch: $ git branch -a => [ skipping lots of branches ] remotes/origin/dev/guile-v2-work [ skipping more remote branches ] (2) checkout $ git checkout dev/guile-v2-work => Branch dev/guile-v2-work set up to track remote branch dev/guile-v2-work from origin. Switched to a new branch 'dev/guile-v2-work' (3) updating it $ git rebase master [skipping output, resolving merge-conflicts, applying additional patches] (4) attempt to push in order to make the updates public $ git push origin HEAD:dev/guile-v2-work To ssh://[email protected]/srv/git/lilypond.git ! [rejected] HEAD -> dev/guile-v2-work (non-fast-forward) error: failed to push some refs to 'ssh://[email protected]/srv/git/lilypond.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Obviously I did something wrong. What would be the correct method? Cheers, Harm _______________________________________________ lilypond-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/lilypond-devel
