[Tuxmath-devel] Git: "commonification" is now master

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

Hi everyone,

I have just renamed tuxmath's "master" to "old_master" in git on our
alioth server, and likewise renamed "commonification" to "master".

If you have local branches tracking these remotes, you will encounter
a severe merge error if you do a "git pull".  In order to have your
local "master" track the server's "master" (which is what used to be
"commonification"), do the following while on "master" locally:

git reset --hard origin/master

Cheers,

David