ever since the master shifted to 2.30 i am having this problem.
same thing happens for several files.
i am sick of recloning.
pl tell me what to do.
tia
dr.tv
--
d...@narayana:~/git/gnome-control-center/po$ git up
remote: Counting objects: 12, done.
remote: Compressing objects: 100% (7/7), done.
Unpacking objects: 100% (7/7), done.
remote: Total 7 (delta 5), reused 0 (delta 0)
>From ssh://vasude...@git.gnome.org/git/gnome-control-center
2d5a4a9..80b0976 gnome-2-28 -> origin/gnome-2-28
0c5b06f..3223742 master -> origin/master
You asked me to pull without telling me which branch you
want to merge with, and 'branch..merge' in
your configuration file does not tell me either. Please
name which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details on the refspec.
If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:
branch..remote = <nickname>
branch..merge = <remote-ref>
remote.<nickname>.url = <url>
remote.<nickname>.fetch = <refspec>
See git-config(1) for details.
d...@narayana:~/git/gnome-control-center/po$
--
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
