Re: [Tuxmath-devel] GHOP.

[David B. <dav...@gm...>]

Hello Haris,

On Fri, Oct 15, 2010 at 8:20 PM, blucalvin <blu...@gm...> wrote:
> Hi,
>
> I've been going through the git book for a while and would like to get
> involved in the project now. I have installed in my system your previous
> code. That is, before you made "commonification" your master.

You should get your git repository up to date.  To have your local
"master" branch correspond to the current master in the Alioth
repository (without having git try to merge to your local copy of the
"old" master), switch to master and then reset it to point to the
correct remote branch:

git checkout master
git reset --hard origin/master

Then, each time you work on tuxmath, start by pulling in any new changes:

git pull

As you have probably read, it is considered good practice to make
local branches for whatever you want to work on, then merge your work
back into master on your own machine before trying to push anything
upstream.  That way, you can see that the merge works, and can test to
see that the new version builds and runs correctly.

> I also came to
> see about GHOP. Its the first time I'm hearing about it. Can I get involved?

The new iteration of GHOP (now called "Google Code-In") hasn't
actually started yet.  There is supposed to be an announcement from
Google about how we (Tux4Kids, that is) can apply to be a
participating organization.  I assume we will be part of it, but
nothing has actually happened yet.

If you meet Google's criteria for participation, you can certainly get
involved as far as I am concerned.  Of course, anyone is free to
contribute to Tux4Kids at any time, irrespective of outside programs
like GSoC/Code-In.

Best,

David Bruce