Graham Percival <gra...@percival-music.ca> writes: > On Wed, Nov 09, 2011 at 10:18:08PM +0100, David Kastrup wrote: >> Graham Percival <gra...@percival-music.ca> writes: >> >> > can somebody fix this? and depending on dak, either push directly >> > to master (which means he has to play yet more games with >> > dev/staging), >> >> dev/staging is in a reasonably calm state right now and would be easy to >> rebase. But what's the advantage? > > as soon as something is in master, I can move it to > release/unstable and build a release.
I rebased dev/staging on top of an emergency fix (no idea whether this will do the trick). Feel free to git merge --ff-only only this fix or all of dev/staging. Either way, dev/staging does not need another rebasing to move to master eventually. -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
