Btw,
Here's the config for .git
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = git://git.b9.com/clsql.git
fetch = +refs/heads/*:refs/remotes/origin/*
[remote "sll"]
url = git://repo.or.cz/clsql/sll.git
fetch = +refs/heads/*:refs/remotes/sll/*
On Jul 19, 2:26 pm, steven yip <[email protected]> wrote:
> hi,
>
> I am trying out weblocks on Debian. I got most of the clbuild to
> download the necessary packages.
>
> However when I tried to ./clbuild install clsql
>
> ---
> UPDATE git pull
> clsql
> You asked me to pull without telling me which branch you
> want to merge with, and 'branch.master.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.master.remote = <nickname>
> branch.master.merge = <remote-ref>
> remote.<nickname>.url = <url>
> remote.<nickname>.fetch = <refspec>
>
> See git-config(1) for details.
>
> error: update was interrupted.
> Use "clbuild update --resume" to retry. (See also "clbuild skip
> PROJECT").
>
> ---
>
> I would like to know how to fix this? I noticed .git folder in my
> clbuild/source/clsql folder.
>
> Thanks...
--
You received this message because you are subscribed to the Google Groups
"weblocks" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/weblocks?hl=en.
