Le mercredi 20 mai 2009 à 11:45 +0530, Tirumurti Vasudevan a écrit : > no end to my problems! > --- > d...@narayana:~$ cd git > d...@narayana:~/git$ cd orca > d...@narayana:~/git/orca$ git pull --rebase > po/ta.po: needs update > refusing to pull with rebase: your working tree is not up-to-date
That message tells you that you have non committed change in your working tree (po/ta.po in this case). You should either: - commit your file (git commit po/ta.po -m "<commit message>") - reset the file to the version of the last commit (git checkout po/ta.po) Then the git pull -- rebase will work and you will be able to push your changes. Hope this helps Claude > d...@narayana:~/git/orca$ cd po/ > d...@narayana:~/git/orca/po$ intltool-update ta > ................................................................................................................................ > done. > 1270 translated messages. > d...@narayana:~/git/orca/po$ > -------------------------- > ta. po has been updated and commited but i am not able to push it. > so i try pull --rebase and that does not work as you can see > > someone please help > > drtv > > _______________________________________________ > gnome-i18n mailing list > gnome-i18n@gnome.org > http://mail.gnome.org/mailman/listinfo/gnome-i18n _______________________________________________ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
