Branching and development

We use the Git Flow branching model, for Bill. If you're not familiar with it, it's just a more structured way of maintaining a repository, through it's branches.

Main Branches

We have two 'main' branches, master and develop.

Master

The master branch contains our distribution code and changes are only pushed to here, from develop, once they have been fully tested and we are sure that they work correctly.

Develop

As the name suggest, the develop branch is our active development branch. Any changes are pushed to here, before going to master. This allows us to screen everything and test it, before pushing it to outfacing users.

Other branches

If you are working on a particular feature (such as a new modal dialogue or a fix to the navigation menu), you are welcome to create a new branch for it.

If doing so, please ensure that you branch from develop, rather than master. Once you're done, just merge your changes back to develop, for testing.

Features, branched from develop should follow this naming convention:

feature/{feature_name}

where {feature_name} is the name of your feature.