Le vendredi 09 novembre 2007 à 11:54 -0800, Graham Percival a écrit : > John Mandereau wrote: > > Speaking of compilation, I updated Texinfo requirement in master, as the > > new macros.itexi requires 4.11. > > I already did that on GDP, so you might have an issue when doing the > next merge. (I don't know how git resolves such things)
As you bumped Texinfo version in a separate commit, there is no real problem :-) Actually, I didn't merge lilypond/gdp into master; the advantage of merging is that you solve conflicts once, whereas after rebasing (like I did on master) you have to cherry-pick further commits one by one from GDP to master. I wasn't aware of this before choosing to rebase :-( I'm really an idiot, I should have handle it the same way as It's too late to merge GDP into master now, it'd mess master revision history. I offer to handle those weekly cherry-pickings, if there is no objection. Cheers, John _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
