well i though i got it.
i ran 'git reset --hard' because still some folders have the problem from my
"changing permissions" mess.
i figure this will disappear in time as i handle all the folders in due
course.
problem seems to be some changed files in the repo.
here are the steps i took and the problem.
i dont understand if the problem is in my end or the repo.
i am sorry to be such a bother.
regards
tv
d...@narayana:~/git/gnome-games/po$ git log master..origin
commit a6665c05df3b00d35ddfeb697ad9184a35c19cd8
Author: Chao-Hsiung Liao <j_h_l...@yahoo.com.tw>
Date: Wed May 27 20:24:38 2009 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
commit 11c25438128f9d748057bd460db655498b614fe4
Author: Robert Ancell <robert.anc...@gmail.com>
Date: Tue May 26 13:52:34 2009 +0200
Fix up menu icon sizes and underlines
commit d353f4fb7106cfe7c66b6fdfad4d87f846eb60bd
Author: Robert Ancell <robert.anc...@gmail.com>
Date: Mon May 25 14:10:10 2009 +0200
occured->occurred
commit 61968cef4fffa2294d533f3a2a3618511e4b00b0
Author: Thomas Hindoe Paaboel Andersen <pho...@gmail.com>
Date: Tue May 26 01:25:29 2009 +0200
Replace a renamed file in POTFILES.in
:
d...@narayana:~/git/gnome-games/po$ git up
remote: Counting objects: 17, done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 12 (delta 10), reused 0 (delta 0)
Unpacking objects: 100% (12/12), done.
>From ssh://vasude...@git.gnome.org/git/gnome-games
52f0e10..5fccfad sudoku-tube -> origin/sudoku-tube
First, rewinding head to replay your work on top of it...
Applying Updated Tamil translation
error: patch failed: po/ta.po:4044
error: po/ta.po: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged po/ta.po
CONFLICT (content): Merge conflict in po/ta.po
Failed to merge in the changes.
Patch failed at 0001.
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
d...@narayana:~/git/gnome-games/po$
On Sat, May 30, 2009 at 6:42 PM, Simos Xenitellis <
simos.li...@googlemail.com> wrote:
> I looked again the 'I messed up' section at
> http://live.gnome.org/TranslationProject/GitHowTo
> and I realised that the instructions were not clear enough.
> In particular, it gave the impression (no, it said erroneously) that
> 'git reset --hard'
> makes your local repository in sync with git.gnome.org, which is not
> true in some cases.
>
> Please see that section again and I am looking forward for feedback.
>
--
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
