site source is on bitbucket

[sinewalker]

Initially this site was created with Nikola and the source stored at BitBucket. Mainly because I understood mercurial more than git. I still do, but I'm going to change that.

I need to migrate all the stuff from BitBucket into the right branch on this repo, and reconfigure Nikola's deployments to use github_deploy.

[sinewalker]

What I need to understand is

• A little bit about git/github branching (I don't intend to merge, of course)
• How Nikola github_deploy works and what it needs
• which branch does the Nikola source go into, and which is for publishing (i think Master, because this is a Personal GitHub Pages page, not an Organisation one)

[sinewalker]

I now have 3 branches

• master (the live site on GHP)
• src (where the source tree lives)
• hax (weird cruft)

I also have a working config, apart from the github_deploy

[sinewalker]

i have the source in github now. the deploy is a larger problem, making a new issue for that.