running into similar problem again i resolved it following the advice offered here. i post this here so that anyone with similar problem can benefit
--- d...@narayana:~$ cd git/gedit/po d...@narayana:~/git/gedit/po$ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # # modified: ../AUTHORS # modified: ../BUGS blah blah many lines... # modified: ../data/gedit.pc.in d...@narayana:~$ cd git/gedit/po git pull --rebase gedit/dialogs/gedit-encodings-dialog.h: needs update ....blah blah... some 500 strings win32/README: needs update win32/gedit.iss.in: needs update refusing to pull with rebase: your working tree is not up-to-date d...@narayana:~/git/gedit/po$ git reset --hard HEAD is now at 472f028 Updated Tamil translation d...@narayana:~/git/gedit/po$ git pull --rebase remote: Counting objects: 302, done. remote: Compressing objects: 100% (163/163), done. remote: Total 247 (delta 207), reused 99 (delta 84) Receiving objects: 100% (247/247), 49.54 KiB | 11 KiB/s, done. Resolving deltas: 100% (207/207), completed with 55 local objects. >From ssh://vasude...@git.gnome.org/git/gedit 15cbac4..a2f55e0 master -> origin/master First, rewinding head to replay your work on top of it... Applying Updated Tamil translation d...@narayana:~/git/gedit/po$ git commit ta.po -m "Updated Tamil translation" (looks like this was not needed) # On branch master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # ta.po~ nothing added to commit but untracked files present (use "git add" to track) d...@narayana:~/git/gedit/po$ git push Counting objects: 7, done. Compressing objects: 100% (4/4), done. Writing objects: 100% (4/4), 2.76 KiB, done. Total 4 (delta 3), reused 0 (delta 0) To ssh://vasude...@git.gnome.org/git/gedit a2f55e0..ecf3af2 master -> master d...@narayana:~/git/gedit/po$ -- done! whew! On Sun, May 24, 2009 at 9:32 PM, Tirumurti Vasudevan <agnih...@gmail.com> wrote: > When you are in doubt, it is good to clean up your local repository and make > it >> match to what is available on git.gnome.org. That is 'git reset >> --hard' and then 'git up' (see below). > > ok noted. -- 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
