Thomas Morley <thomasmorle...@gmail.com> writes: > 2015-11-17 14:51 GMT+01:00 David Kastrup <d...@gnu.org>: >> David Kastrup <d...@gnu.org> writes: >> >>> James <p...@gnu.org> writes: >>> >>>> If i look for that ly file I get this >>>> >>>> --snip-- >>> >>>> \Score >>>> noteToFretFunction = #(determine-frets #t) >>>> } >>>> } >>> >>>> This seems to match the noteToFretFunction function in the commit changes >>> >>> Well, seems like "too-fast-for-you": Thomas undid his own changes to the >>> determine-frets function and semantics, but this one is in the French >>> translation by Jean-Charles. >>> >>> So one probably needs to see what Thomas did to the German documentation >>> in the course of his commit and then transfer that change to the French >>> one. >> >> Ok, that was less than helpful. I'll take a look at the commit and try >> amending it. Should not take more than a quarter of an hour. > > Hm, before I pushed this, I had gotten a merge conflict while rebasing. > Was in "/Documentation/notation/fretted-strings.itely", iirc. > Resolved it manually. > > Though, I didn't even touch the french or any other > fretted-strings.itely-file and didn't notice it before pushing. > > Did I something wrong? > If so, what can I do to avoid this mess?
In this particular case, do a "git grep" for the stuff to be backed out again, like '(determine-frets #' or similar. Since the change was in the translations, not even reverting the original commit would have restored the stuff to working state. It was sort of unlucky that the Patchy testing occured while the translations were not yet merged back into master. -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
