Code integration

Updating the code base

It is every developers own responsibility to make sure that their code works with the code base in the integration branch. Therefore the following code integration procedure is recommended:

1. Merge the integration branch into your own feature branch
2. Resolve any merge conflicts in the code
3. Run tests and make sure that they are passed
4. Merge (with --no-ff, no fast-forward, turned on) your own feature branch into the integration branch

Releasing a new version

It is the duty of the integration manager to prepare a new release candidate. A new release branch should be created from the integration branch. This release branch may not include any new features from this point, only bug fixes and new tests to reproduce bugs.

Eventually this release branch should be merged into the master branch, but only when all tests pass.