[no subject]

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

drtv narayana:~/git/gnome-games/po$




On Sat, May 30, 2009 at 6:42 PM, Simos Xenitellis <
simos lists 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!

--000e0cd3274692684a046b236996
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

well i though i got it.<br>i ran &#39;git reset --hard&#39; because still s=
ome folders have the problem from my &quot;changing permissions&quot; mess.=
<br>=C2=A0i figure this will disappear in time as i handle all the folders =
in due course.<br>

problem seems to be some changed files in the repo.<br><br>here are the ste=
ps i took and the problem.<br>i dont understand if the problem is in my end=
 or the repo.<br>i am sorry to be such a bother.<br>regards<br>tv<br><br>

drtv narayana:~/git/gnome-games/po$ git log master..origin<br>commit a6665c=
05df3b00d35ddfeb697ad9184a35c19cd8<br>Author: Chao-Hsiung Liao &lt;<a href=
=3D"mailto:j_h_liau yahoo com tw">j_h_liau yahoo com tw</a>&gt;<br>Date:=C2=
=A0=C2=A0 Wed May 27 20:24:38 2009 +0800<br>

<br>=C2=A0=C2=A0=C2=A0 Updated Traditional Chinese translation(Hong Kong an=
d Taiwan)<br><br>commit 11c25438128f9d748057bd460db655498b614fe4<br>Author:=
 Robert Ancell &lt;<a href=3D"mailto:robert ancell gmail com">robert.ancell=
@gmail.com</a>&gt;<br>

Date:=C2=A0=C2=A0 Tue May 26 13:52:34 2009 +0200<br><br>=C2=A0=C2=A0=C2=A0 =
Fix up menu icon sizes and underlines<br><br>commit d353f4fb7106cfe7c66b6fd=
fad4d87f846eb60bd<br>Author: Robert Ancell &lt;<a href=3D"mailto:robert.anc=
ell gmail com">robert ancell gmail com</a>&gt;<br>

Date:=C2=A0=C2=A0 Mon May 25 14:10:10 2009 +0200<br><br>=C2=A0=C2=A0=C2=A0 =
occured-&gt;occurred<br><br>commit 61968cef4fffa2294d533f3a2a3618511e4b00b0=
<br>Author: Thomas Hindoe Paaboel Andersen &lt;<a href=3D"mailto:phomes gma=
il.com">phomes gmail com</a>&gt;<br>

Date:=C2=A0=C2=A0 Tue May 26 01:25:29 2009 +0200<br><br>=C2=A0=C2=A0=C2=A0 =
Replace a renamed file in POTFILES.in<br>:<br>drtv narayana:~/git/gnome-gam=
es/po$ git up<br>remote: Counting objects: 17, done.<br>remote: Compressing=
 objects: 100% (12/12), done.<br>

remote: Total 12 (delta 10), reused 0 (delta 0)<br>Unpacking objects: 100% =
(12/12), done.<br>From ssh://<a href=3D"http://vasudeven git gnome org/git/=
gnome-games">vasudeven git gnome org/git/gnome-games</a><br>=C2=A0=C2=A0 52=
f0e10..5fccfad=C2=A0 sudoku-tube -&gt; origin/sudoku-tube<br>

First, rewinding head to replay your work on top of it...<br>Applying Updat=
ed Tamil translation<br>error: patch failed: po/ta.po:4044<br>error: po/ta.=
po: patch does not apply<br>Using index info to reconstruct a base tree...<=
br>

Falling back to patching base and 3-way merge...<br>Auto-merged po/ta.po<br=
>CONFLICT (content): Merge conflict in po/ta.po<br>Failed to merge in the c=
hanges.<br>Patch failed at 0001.<br><br>When you have resolved this problem=
 run &quot;git rebase --continue&quot;.<br>

If you would prefer to skip this patch, instead run &quot;git rebase --skip=
&quot;.<br>To restore the original branch and stop rebasing run &quot;git r=
ebase --abort&quot;.<br><br>drtv narayana:~/git/gnome-games/po$ <br><br>

<br><br><br><div class=3D"gmail_quote">On Sat, May 30, 2009 at 6:42 PM, Sim=
os Xenitellis <span dir=3D"ltr">&lt;<a href=3D"mailto:simos lists googlemai=
l.com">simos lists googlemail com</a>&gt;</span> wrote:<br><blockquote clas=
s=3D"gmail_quote" style=3D"border-left: 1px solid rgb(204, 204, 204); margi=
n: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">

<div id=3D":v" class=3D"ii gt">I looked again the &#39;I messed up&#39; sec=
tion at<br>
<a href=3D"http://live.gnome.org/TranslationProject/GitHowTo"; target=3D"_bl=
ank">http://live.gnome.org/TranslationProject/GitHowTo</a><br>
and I realised that the instructions were not clear enough.<br>
In particular, it gave the impression (no, it said erroneously) that<br>
&#39;git reset --hard&#39;<br>
makes your local repository in sync with <a href=3D"http://git.gnome.org"; t=
arget=3D"_blank">git.gnome.org</a>, which is not<br>
true in some cases.<br>
<br>
Please see that section again and I am looking forward for feedback.<br>
</div></blockquote></div><br><br clear=3D"all"><br>-- <br>My blogs: [all in=
 Tamil]<br><a href=3D"http://anmikam4dumbme.blogspot.com/";>http://anmikam4d=
umbme.blogspot.com/</a><br><a href=3D"http://chitirampesuthati.blogspot.com=
/">http://chitirampesuthati.blogspot.com/</a> photo blog now with english t=
ext too!<br>

<a href=3D"http://kathaikathaiyaam.blogspot.com/";>http://kathaikathaiyaam.b=
logspot.com/</a><br><br>BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY!<br>

--000e0cd3274692684a046b236996--