Branching strategy

Starting from the first beta release (0.1.0), we're using the "successful Git branching model" model (also nicely described here).

We have a master branch for production environment deployment, and a develop branch where integration of features takes place before a release.

When a developer has finalized a feature, they create a Pull Request from the feature branch into develop. The PR is handled by a reviewer, who can be any other developer on the team.

The reviewer accepts a pull request using the git pretty-accept command (not the 'merge' button on the PR). https://github.com/lovewithfood/git_pretty_accept

Release branches are created off the develop branch and merged into master once a release has been tested and go ahead has been given to go live.