On Sun, Nov 22, 2009 at 4:49 AM, David Kastrup <d...@gnu.org> wrote: >> It's no problem at all, if you do it that way. > > Hello merge conflict, my old friend, I've come to talk with you again... > > If you have ever worked in a project with a central ChangeLog file, you > know the permanent hassle with switching branches when some changes > require entries in a central file.
this is exactly why do not have a central ChangeLog file. -- Han-Wen Nienhuys - han...@xs4all.nl - http://www.xs4all.nl/~hanwen _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
