Thank you for your answers. I prefer "clean slate" in case I did something more stupid, then just mess with the translation :)
Matej On Wed, Feb 23, 2011 at 8:13 PM, Gil Forcada <gforc...@gnome.org> wrote: > El dc 23 de 02 de 2011 a les 18:15 +0100, en/na Matej Urban va escriure: >> Hello, >> >> sometimes it's just too much. >> >> I usually use "the script" to push updates for me, but sometimes I >> just need to do stuff with git by hand. >> >> Yesterday I tried to update one of the packages, but forgot to first >> *git pull* the branch. I overwrote the po translation files, and tried >> to push. When I saw errors of *git push*, I knew that I did (for me) >> unsolvable thing. >> Usually I simply delete the whole directory and clone it again, but >> this one is too big, and honestly, I need to find out how to solve >> this for future occasions. >> >> I tried reverts and resets and it doesn't seem to work. SO ... >> >> HOW do I "remove" all the changes I made and simply start from scratch ... >> >> git reset --hard master tells that the HEAD is now at b5eb062 Revert , >> but when I try to pull I get an error: Untracked working tree file >> would be overwritten by merge. > > This means that in your filesystem there's a file previously not known > by git but that a commit-to-be-applied (from git pull) will overwrite > it, and thus, to prevent loosing that file it does nothing. Just > renaming the file or moving away temporarily would be enough. > > Cheers, > >> Thanks, >> >> Matej >> _______________________________________________ >> gnome-i18n mailing list >> gnome-i18n@gnome.org >> http://mail.gnome.org/mailman/listinfo/gnome-i18n > > -- > Gil Forcada > > [ca] guifi.net - una xarxa lliure que no para de créixer > [en] guifi.net - a non-stopping free network > bloc: http://gil.badall.net > planet: http://planet.guifi.net > > _______________________________________________ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
