Le dimanche 10 juin 2007 à 12:57 +0300, Till Rettig a écrit : > Hi, > > after some busy time I investigated the problem again today and git > suggested me a merge, after which I could pull successfully. Then I > reset my branch to the current commitish of the remote branch > (web/master) and commited my changes (including the actual commitish). > I hope this will finally work now!
No, it doesn't; git-am says error: patch failed: de/about/browser-language.html:65 error: de/about/browser-language.html: patch does not apply Patch failed at 0001. Don't forget that if you don't manage to make a clean patch with git-format-patch, make a patch with "git-diff -p". Good luck John _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel