On Sun, May 24, 2009 at 10:47 PM, Simos Xenitellis
<simos.li...@googlemail.com> wrote:
> You can try 'git log origin..master' to see what commits you performed
> that did not get pushed to git.gnome.org.
> The list needs to be empty in order to 'git up', so that you do not have
> local commits pending.
well this is what happened:
---
d...@narayana:~$ cd git/evince/po
d...@narayana:~/git/evince/po$ git log origin..master
commit 32e96026c513cef5a42c879d2a0bcca467785e9f
Author: drtvasudevan <agnih...@gmail.com>
Date: Sun May 24 21:10:19 2009 +0530
Updated Tamil translation
d...@narayana:~/git/evince/po$ git up
You are in the middle of a conflicted merge.
d...@narayana:~/git/evince/po$ git revert
32e96026c513cef5a42c879d2a0bcca467785e9f
error: Entry 'po/ta.po' would be overwritten by merge. Cannot merge.
fatal: merging of trees e1c2ae602c49058778ee0164aa3a8d74fd8cbb18 and
79ca1263c574e7cc6318d3acb77aa2ee6c95090e failed
Automatic revert failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result.
--
so i took the easy way out.
renamed evince folder and then cloned again.
got the present files in git.
translated and commited.
all well now.
thanks a lot.
perhaps you should add this to the howto page. when all else fails...
reclone. :-))
regards
tv
--
My blogs: [all in Tamil]
http://anmikam4dumbme.blogspot.com/
http://chitirampesuthati.blogspot.com/ photo blog now with english text too!
http://kathaikathaiyaam.blogspot.com/
BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY!
_______________________________________________
gnome-i18n mailing list
gnome-i18n@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-i18n
