Jonathan Kulp a écrit :
Ugh. I have a merge conflict upon pulling. Did I mess up the patch?
What are the conflicting files? Your patch is the last commit on master,
so if Trevor applied it without amending it, the conflict is likely
related to changes other than this patch you made locally.
You certainly already know the Contrib Guide has a paragraph or section
about solving conflicts.
Best,
John
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
