Re: Question about git

[Tirumurti Vasudevan <agnihot3 gmail com>]

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

---
drtv narayana:~$ cd git/gedit/po
drtv 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
drtv 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

drtv narayana:~/git/gedit/po$ git reset --hard

HEAD is now at 472f028 Updated Tamil translation

drtv 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.