Home

Branching model follows http://nvie.com/posts/a-successful-git-branching-model/:

• master branch is stable, HEAD is always the latest release
• develop branch contains the latest code for the next release.
• various feature branches, to be merged into develop upon completion

For a new feature, branch off develop: $ git checkout -b myfeature develop

To merge a feature back into develop: $ git checkout develop $ git merge --no-ff myfeature $ git branch -d myfeature $ git push --tags origin develop

To start a new release, first branch off develop: $ git checkout -b release-1.2 develop

To finalize the release, merge its branch into master and develop, and tag master: $ git checkout master $ git merge --no-ff release-1.2 $ git tag -a 1.2 $ git push --tags origin master $ git checkout develop $ git merge --no-ff release-1.2 $ git branch -d release-1.2

And update PyPi & documentation: $ cd docs/src; make clean html $ python2.5 ./setup.py test $ python2.5 ./setup.py sdist bdist_egg register upload $ scp -r docs/src/_build/html/* xrehurek@aurora.fi.muni.cz:/nlp/projekty/gensim/public_html/