Marco Ciampa (Freitag, 6. November 2009, 20:21): > ... beside from the fact that I'm not translating anything new due > to the fact that one of the last git push destroied ~400 po italian > messages (tell me if I'm wrong and why in case I'm doing something > wrong myself...) Don't panic! ;-) Can you give us an example of a lost(?) translation? Note that you can always get back your files with git checkout [commit] or (not tested) git checkout [commit] po/it where commit is e.g. HEAD^, HEAD^^, or a commit id like 76d2c40dcf... (Hmm, maybe it's better to create a local branch as backup before you try the 'git checkout' command...) > now I'm stuck on git pull too. This is the error > message: > > error: Entry 'src/menus/edit/stroke-path.xml' not uptodate. Cannot > merge. Try git stash # saves changes and creates a # clean working directory git pull git stash pop # restores your changes Bye, Ulf
Attachment:
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Gimp-docs mailing list Gimp-docs@xxxxxxxxxxxxxxxxxxxxxx https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
