Ok, one more try! I send the patch for master/web branch, made with
git-diff -p . Then another patch corrects some mistakes in the web-page
browser-language.thml. The third patch is for the documentation tree,
updated the change Graham did recently.
I just saw some mistakes after building the page and changed them. Then
I tried to build the manual diff with git-diff -p again, but there comes
no output this time. Well, I send you this later update as a normal
patch formatted with git format-patch.
I really don't know what this is: I made sometimes obviously a mistake
not commiting something or that kind of thing. After that I cannot get
the repository clean again. With the translation repository I was just
anxious not to do any mistakes, so that's why this is still clean.
Greetings
Till
John Mandereau wrote:
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
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
