2010/1/26 Erick Tryzelaar <idade...@users.sourceforge.net>
> On Mon, Jan 25, 2010 at 3:20 PM, Klas Ivarsson <klas.ivars...@gmail.com>
> wrote:
> > Ok, I get the following in Git Bash:
> > --------------------
> > $ cd felix
> > $ git remote add github git://github.com/erickt/fbuild.git
> > $ git pull github
> > warning: no common commits
> > remote: Counting objects: 5013, done.
> > remote: Compressing objects: 100% (1387/1387), done.iB/s 7%
> (399/5013),
> > 40.00 KiB | 63 KiB/s
> > remote: Total 5013 (delta 2984), reused 4975 (delta 2961)s
> > Receiving objects: 100% (5013/5013), 681.65 KiB | 87 KiB/s, done.
> > Resolving deltas: 100% (2984/2984), done.
> > From git://github.com/erickt/fbuild
> > * [new branch] master -> github/master
> > You asked to pull from the remote 'github', but did not specify
> > a branch to merge. Because this is not the default configured remote
> > for your current branch, you must specify a branch on the command line.
> > ------------------
> >
> > I must admit I've never used git before, so I don't quite get whats
> > happening ;(
> > Well, time to start reading the manual i guess ;)
>
> Oh, I told you the wrong thing, it should have been "git pull github
> master". However, you don't need to do that, since I pushed out my
> fbuild fix to felix. So, you can instead run this from the felix
> checkout directory:
>
> git submodule init
> git submodule update
>
> And it should theoretically pull the right fbuild commit from the
> repository and check it out automatically. Then you should be able to
> run fbuild again. Hopefully that fixed your problems.
Hmmm...sorry, no progress.
git submodule init
git submodule update
Didn't cause any complaints, but not much visible reactions either...
and if I continue with "python fbuild\fbuild-light -v" I get the same result
as previous.
and "git pull github master" caused:
$ git pull github master
>From git://github.com/erickt/fbuild
* branch master -> FETCH_HEAD
Auto-merging .gitmodules
CONFLICT (add/add): Merge conflict in .gitmodules
Automatic merge failed; fix conflicts and then commit the result.
\Klas
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Felix-language mailing list
Felix-language@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/felix-language
