On 2 mars 2013, at 10:28, David Kastrup <d...@gnu.org> wrote: > "m...@mikesolomon.org" <m...@mikesolomon.org> writes: > >> On 2 mars 2013, at 10:16, David Kastrup <d...@gnu.org> wrote: >> >>> James <pkx1...@gmail.com> writes: >>> >>>> From: James <pkx1...@gmail.com> >>>> Subject: Cannot Merge Staging this mornining >>>> Newsgroups: gmane.comp.gnu.lilypond.devel >>>> To: Devel <lilypond-devel@gnu.org> >>>> Date: Sat, 2 Mar 2013 09:02:37 +0000 (4 minutes, 27 seconds ago) >>>> >>>> Fails on Make. >>>> >>>> Only one commit in staging >>>> >>>> http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commit;h=2ae751cb5169165c23e3b1a9a2da2182ef8c78ba >>>> >>>> --- >>>> >>>> Avoids measuring distances between empty and non-empty skylines >>>> staging >>> >>> Removed from staging. See >>> <URL:http://code.google.com/p/lilypond/issues/detail?id=3169#c12> >>> >> >> Found the problem - I forgot to add skyline.scm in the commit. > > How can you even do that when using git and git cl for reviews and > Rietveld had it on display?
I make a diff off of my branch and then I do git apply mydiff.diff instead of merging. This way I don't include the entire commit history of my local branch into LilyPond. But it means that I need to manually add all new files. Cheers, MS _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
