Re: rebase-question

[Thomas Morley]

2015-05-01 11:31 GMT+02:00 David Kastrup <address@hidden>:
> Thomas Morley <address@hidden> writes:
>
>> In my most recent patch for Issue 4344 I found this line:
>>    \override NoteHead.ignore-ambitus = ##t
>> https://codereview.appspot.com/223420043/diff2/20001:40001/ly/engraver-init.ly?context=10&column_width=80
>>
>> I didn't insert it myself, but I made a rebase against master before upload.
>>
>> Is this expected behaviour?
>
> Sort of if it's in a file containing also changes by you.

It is.

> Not rebasing
> avoids reintroducing such changes from master, but of course when they
> are close enough to changes from yourself, the patch might no longer
> apply.
>
> I don't really understand Rietveld all that well.  But yes, this happens.
>
> --
> David Kastrup

Thanks for the info.
  Harm