Re: [Lilypond-auto] Issue 2689 in lilypond: Patch: Avoid duplication between slur and phrasing slur engravers.

[lilypond]

Comment #6 on issue 2689 by address@hidden: Patch: Avoid duplication between  
slur and phrasing slur engravers.
http://code.google.com/p/lilypond/issues/detail?id=2689

address@hidden writes:

Well, you'll likely have the inheritance stuff in a separate commit.
Cherry-pick this commit into a branch of its own (based off master) and
fix the merge errors from unrelated work.  Once this works fine and
reviews look favorable, rebase your repeat slur work on that.  Yes,
you'll have to work off the merge conflicts (but they'll mostly consist
in throwing away stuff that no longer applies).

A different approach would be
git fetch
git rebase origin
git rebase -i origin # now juggle the commit with the inheritance stuff
                     # to the top, save and
# fix all the merge conflicts in the rebase, then make a separate branch
# for the first commit and submit it for issue 2689

I find the second approach easier to handle mentally (git rebase -i is
rather intuitive to use), but the merge conflicts to resolve manually
will be the same either case.

--
You received this message because this project is configured to send all  
issue notifications to this address.
You may adjust your notification preferences at:
https://code.google.com/hosting/settings