Re: I seem to have broken staging

Le 17/11/2015 22:37, David Kastrup a écrit : Thomas Morley writes: 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

Re: I seem to have broken staging

Jean-Charles Malahieude writes: > Le 17/11/2015 22:37, David Kastrup a écrit : >> Thomas Morley writes: >> >>> Hm, before I pushed this, I had gotten a merge conflict while rebasing. >>> Was in "/Documentation/notation/fretted-strings.itely", iirc.

Re: I seem to have broken staging

James writes: > Hello, > > It seems that patchy staging merge fails, the last checkins were by me. > > Sorry for this, I am looking at this now. Rather looks like Thomas Morley. Your commits seem to have made it into master fine already. I'll take a look. -- David Kastrup

I seem to have broken staging

Hello, It seems that patchy staging merge fails, the last checkins were by me. Sorry for this, I am looking at this now. Regards James ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: I seem to have broken staging

Not sure of this helps: On 17/11/15 12:24, David Kastrup wrote: > James writes: > >> Hello, >> >> It seems that patchy staging merge fails, the last checkins were by me. >> >> Sorry for this, I am looking at this now. > Rather looks like Thomas Morley. Your commits seem to have

Re: I seem to have broken staging

David Kastrup writes: > James 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,

Re: I seem to have broken staging

James writes: > Not sure of this helps: > > On 17/11/15 12:24, David Kastrup wrote: >> James writes: >> >>> Hello, >>> >>> It seems that patchy staging merge fails, the last checkins were by me. >>> >>> Sorry for this, I am looking at this now. >> Rather looks like

Re: I seem to have broken staging

2015-11-17 14:51 GMT+01:00 David Kastrup : > David Kastrup writes: > >> James writes: >> >>> If i look for that ly file I get this >>> >>> --snip-- >> >>> \Score >>> noteToFretFunction = #(determine-frets #t) >>> } >>> } >> >>> This seems to

Re: I seem to have broken staging

Thomas Morley writes: > 2015-11-17 14:51 GMT+01:00 David Kastrup : >> David Kastrup writes: >> >>> James writes: >>> If i look for that ly file I get this --snip-- >>> \Score noteToFretFunction