Le samedi 11 septembre 2010 à 15:35 +0530, Tirumurti Vasudevan a écrit : > in an attempt to update the gnome-color-manager of gnome 2.32 which is > spoiling my statistics i tried and failed. > pl see the msg and suggest what to do. > regards > drtv > ------------------------------ > > d...@narayana:~/git$ cd .. > d...@narayana:~$ cd gnome-color-manager/po > d...@narayana:~/gnome-color-manager/po$ git branch > * master > d...@narayana:~/gnome-color-manager/po$ git checkout --track > origin/gnome-2-30 > error: You have local changes to 'po/ta.po'; cannot switch branches.
As the message states, you have changes in po/ta.po. Now it depends on what are those changes: - if po/ta.po changes are not significant (maybe an intltool-update result), just drop the changes with "git checkout po/ta.po" that will restore the original committed file. - if po/ta.po contains important changes you want to commit on a branch, just copy the file under a new name (cp po/ta.po po/ta-tmp.po), reset the original file (git checkout po/ta.po), checkout the new branch and restore the file (mv po/ta-tmp.po po/ta.po). Just a note for those who could have suggested to stash the changes, depending on the origin of the po file (maybe a merge on l10n.gnome.org), reapplying the stash in a branch might reveal almost impossible. HTH, Claude > d...@narayana:~/gnome-color-manager/po$ git checkout --track > origin/gnome-2-32 > error: You have local changes to 'po/ta.po'; cannot switch branches. > d...@narayana:~/gnome-color-manager/po$ git branch -a > * master > remotes/origin/HEAD -> origin/master > remotes/origin/gnome-2-30 > remotes/origin/gnome-2-32 > remotes/origin/master > d...@narayana:~/gnome-color-manager/po$ git push origin gnome-2-32 > error: src refspec gnome-2-32 does not match any. > error: failed to push some refs to > 'ssh://vasude...@git.gnome.org/git/gnome-color-manager' > d...@narayana:~/gnome-color-manager/po$ > > -- > http://www.swaminathar.org/ > http://aanmikamforyouth.blogspot.com/ _______________________________________________ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
