CAW Studios follows the popular GIT Flow model of development. Git flow is a popular Git branching strategy aimed at simplifying release management and was introduced by software developer Vincent Driessen in 2010. Fundamentally, Git flow involves isolating your work into different types of Git branches. Today, we’ll cover the different branches in the Git flow workflow. Refer https://nvie.com/posts/a-successful-git-branching-model/

TL;DR

• To start working on a new feature create a new branch from ‘develop’ with the name 'feature/<JIRA-ID>-<feature title>'
• Create branch named hotfix/<JIRA-ID>-<bug-title> to fix bugs in production.
• Create a pull request from the feature branch to “develop” branch and merge it to develop only after the code review is done and all the review comments are fixed.
• Create a pull request from the hotfix branch to the master branch and merge it to the master only after the code review is done and all the review comments are fixed.
• No development should be done on “develop”, main or release branch

Different branches for different environments

In the Git flow workflow, there are five different branch types:

1. Main (or Master) branch

As the name suggests, we consider this branch to be the main branch where the source code always reflects a production-ready state.

2. Develop branch

We consider this to be the branch where the source code always reflects a state with the latest delivered development changes for the next release.

Newly-created features should be based on the “develop” branch, and then merged back in when ready for testing.

3. Feature branches

The feature branch is the most common type of branch in the Git flow workflow. It is used when adding new features to your code.