---------- Forwarded message ----------
From:
Tirumurti Vasudevan <agnihot3 gmail com>
Date: Sat, Sep 11, 2010 at 4:36 PM
Subject: Re: git problems
To: Claude Paroz <
claude 2xlibre net>
seems to have worked.
let me see it get reflected in the web and i shall do the same for other files leftover like that.
thanks for helping
regards
dr tv
------
drtv narayana:~/gnome-color-manager/po$ cd ..
drtv narayana:~/gnome-color-manager$ git checkout --track origin/gnome-2-32
error: You have local changes to 'po/ta.po'; cannot switch branches.
drtv narayana:~/gnome-color-manager$ git reset --hard HEAD^
HEAD is now at 2e3bb4c Updated Tamil translation
drtv narayana:~/gnome-color-manager$ git reset --hard HEAD^HEAD is now at 084f17f Updated Slovenian translation
drtv narayana:~/gnome-color-manager$ cd po
drtv narayana:~/gnome-color-manager/po$ git checkout ta.po
drtv narayana:~/gnome-color-manager/po$ git checkout --track origin/gnome-2-32
Branch gnome-2-32 set up to track remote branch gnome-2-32 from origin.
Switched to a new branch 'gnome-2-32'
drtv narayana:~/gnome-color-manager/po$ git commit -m "Updated Tamil translation" ta.po
[gnome-2-32 910b12f] Updated Tamil translation
1 files changed, 2019 insertions(+), 145 deletions(-)
drtv narayana:~/gnome-color-manager/po$ git push
Counting objects: 7, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 20.36 KiB, done.
Total 4 (delta 2), reused 0 (delta 0)
To ssh://
vasudeven git gnome org/git/gnome-color-manager
67e9c73..910b12f gnome-2-32 -> gnome-2-32
drtv narayana:~/gnome-color-manager/po$ git checkout master
Switched to branch 'master'
Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
drtv narayana:~/gnome-color-manager/po$ git up
First, rewinding head to replay your work on top of it...
Fast-forwarded master to 6578d698eed9eff3969537910a0b9bd007ebb83d.
drtv narayana:~/gnome-color-manager/po$ intltool-update ta
............................................ done.
369 translated messages.
drtv narayana:~/gnome-color-manager/po$
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.
