Am Montag, 23. November 2009 07:19:58 schrieb David Kastrup: > Han-Wen Nienhuys <hanw...@gmail.com> writes: > > this is exactly why do not have a central ChangeLog file. > > Sure, that's sane. I am just saying that a central place to register > properties has the same problem.
No, with a ChangeLog, changes are always appended at the beginning (or at the end), so two persons adding entries will invariably lead to automatic merge problems. However, properties are alphabetically sorted, so the longer the list, the smaller the chance that the two committers are working on the same three lines that are relevant to the two patches. If the patches don't overlap, the automatic merge of git rebase or git merge will take care of the merge, and you won't see any problems. Cheers, Reinhold -- ------------------------------------------------------------------ Reinhold Kainhofer, reinh...@kainhofer.com, http://reinhold.kainhofer.com/ * Financial & Actuarial Math., Vienna Univ. of Technology, Austria * http://www.fam.tuwien.ac.at/, DVR: 0005886 * LilyPond, Music typesetting, http://www.lilypond.org _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
