Thomas Morley <thomasmorle...@googlemail.com> writes: > 2012/12/2 David Kastrup <d...@gnu.org>: >> David Kastrup <d...@gnu.org> writes: >> >>> Do >>> >>> git pull -r >>> >>> first to get your patch up-to-date. >> >> To get your git-cl repository up-to-date, sorry. >> >> -- >> David Kastrup >> >> >> _______________________________________________ >> lilypond-devel mailing list >> lilypond-devel@gnu.org >> https://lists.gnu.org/mailman/listinfo/lilypond-devel > > Tried to do what you suggested. > Without success, with uploading the patch. > The only difference: > > harm@harm-laptop ~/lilypond-git (dev/local_working|AM)$ git pull -r > It looks like git-am is in progress. Cannot rebase.
Well, then a failed git-am is still unfinished. So first do git am --abort and then try pulling again. -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
