On Sun, May 24, 2009 at 9:20 PM, Simos Xenitellis <[email protected]> wrote: > I think the previous command removed your commit, or something went wrong. > When you are in doubt, it is good to clean up your local repository and make > it > match to what is available on git.gnome.org. That is 'git reset > --hard' and then 'git up' (see below).
ok noted. > > On the issue of 'git pull --rebase', the documentation has a new alias > so that you can > simply run > > git up yeas, this is simpler! > and you get 'git pull --rebase'. This should make it easier and less > error-prone. > See http://live.gnome.org/TranslationProject/GitHowTo and 'Configure your > git'. yes it is there. >> question is why does it refuse to rebase when i know the file in the >> repository has changed? >> or should i be using intltool-update ta command? > > 'git up' (git pull; git pull --rebase or 'pull' in general) only work > when there are no uncommitted changes on tracked files. > That is, when you modify a tracked file (such as ta.po which is > already on the repository), > you cannot 'pull', unless you commit. You need to perform the pull > before you change files. > Or you need to commit the changes and then try to pull. if the change is only ion the repo then i need to do git up. if i have changed any files then i shd vcommit and then pull, right? ok one more problem but i will start a different thread for that regards drtv ps: dont you guys ever sleep? :-)) -- 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 [email protected] http://mail.gnome.org/mailman/listinfo/gnome-i18n
