Gitflow

Source: https://blog.axosoft.com/gitflow/

Note: Gitflow is used to develop the TNRIS website because it assists with code organization, modularity, and efficiency.

Workflow Model

Gitflow utilizes the core feature of Git, which is the power of branches. In this model, a repository has two main branches:

1. Master — This is a highly stable branch that is always production-ready and contains the last release version of source code in production.
2. Develop — Derived from the master branch, the development branch serves as a branch for integrating different features planned for an upcoming release. This branch may or may not be as stable as the master branch. It is where developers collaborate and merge feature branches.

Note: The previous two branches are the starting points for any project. They are very important and should be protected against accidental deletion until the project is better defined. Only authorized leads or project owners should be given the responsibility to merge changes from other branches—such as the feature branch, which we’ll discuss later—to the develop or master branches.

Apart from those two primary branches, there are other branches in the workflow:

1. Feature — This derives from the develop branch and is used to develop features.
2. Release — This also derives from develop branch but is used during releases.
3. Hotfix — This derives from the master branch and is used to fix a bug in the production branch that was identified after a release.