On Sat, Nov 07, 2009 at 02:54:35PM +0100, Ulf-D. Ehlert wrote: > 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 git stash [...] git stash pop CONFLICT (delete/modify): po/de/concepts.po deleted in Stashed changes and modified in Updated upstream. Version Updated upstream of po/de/concepts.po left in tree. Auto-merging src/menus/edit/stroke-path.xml marco@ciampix-lap2:~/git-gnome/gimp-help-2$ git status po/de/concepts.po: needs merge # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: images/it/using/toolbox-description.png # modified: po/it/appendix.po # modified: po/it/concepts.po # modified: po/it/menus.po # modified: po/it/menus/edit.po # modified: po/it/menus/help.po # modified: po/it/menus/image.po # modified: po/it/menus/layer.po # modified: po/it/menus/select.po # modified: po/it/menus/view.po # modified: po/it/preface.po # modified: po/it/using.po # modified: src/menus/edit/stroke-path.xml # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working # directory) # # unmerged: po/de/concepts.po # stuck again! :-( -- Marco Ciampa +--------------------+ | Linux User #78271 | | FSFE fellow #364 | +--------------------+ _______________________________________________ Gimp-docs mailing list Gimp-docs@xxxxxxxxxxxxxxxxxxxxxx https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
