This is the git repository of Team Echo for the University of Pretoria Computer Science COS301 2016 module.
This repository has adopted the git flow branching model. The creators of git flow released a short intro video to explain the model.
The master branch is production-ready and contains the latest tagged releases. Before a release is made, it is stagged in release/x branches before being pushed and tagged in the master branch. Small patches from hotfix/x branches are also pushed to master, and will always have a release version. The develop branch is pre-production, and is where we push feature/x branches for testing.
Most modern git clients support git flow. If you are however using the git CLI on *nix, please install the git flow plugin on your distribution.
All developers working on this repository are required to add there details to the CONTRIBUTORS.md file. A name, surname and student number are mandatory, but feel free to add any other information, like social links.