Skip to content

Gitflow

Nihar Sawant edited this page Jan 15, 2018 · 1 revision

To maintain the repository, we will be following the Gitflow model which is a very standard practice.

There will be three types of branches -

  1. Feature Branches - When you want to add new content to the repository, you should create a new branch and add the subsequent changes over there. Once the changes have been completed create a pull request for develop or staging branch. You should never directly edit the content of master neither create a direct pull request to master.
  2. develop / staging - Content in this branch should come from Features branches pull request. Once the pull request is reviewed, features branches should get merged in this branch. This branch will be used for staging environment of Dev Centre. As per the release cycle, this branch should responsible for adding contents in master branch.
  3. master - master branch will be the production-ready stable branch where final content will be present. All the branches should be derived from master branches. The only way to add content to this branch is by sending a pull request. This pull request can be approved by repository admins.

Please keep in mind that every new change added in the master branch should have a git tag which will make it easier to switch between old content and new content in case if there is any issues.

This process could be illustrated in better way in the diagram below -

Gitflow

Clone this wiki locally