Branching Model

Model Adopted

The main branches in this flow are:

master branch contains the code in production. The build is generated from the same.
develop branch is the development branch. Once a set of features decided for a release have been decided, the develop code is merged into master. features, redesign and issues are supposed to be created from the develop branch.
hotfix represents any immediate issue that needs to be addressed for the production version. Must be created from master. hotfix must be succecced with a - and the issue name.
features represets new features to be added to the tool. features should be suffixed with a hyphen and the new feature code.
redesign represents the redesigning of the components. Refactoring of code can be done using the same branch name. redesign should also follow patter of naming as feature.
issues branch represents the issues to resolved. The difference between hotfix and issues would be urgency of time. Issues would be resolved and merged into subsequent releases.

We follow similar model as stated in the following link - GitFlow Workflow Model