Re: I seem to have broken staging

[Thomas Morley]

2015-11-17 14:51 GMT+01:00 David Kastrup <address@hidden>:
> David Kastrup <address@hidden> writes:
>
>> James <address@hidden> 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.
>
> --
> David Kastrup



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?


Cheers,
  Harm