Skip to content

Home

Jump to bottom
Nthiki edited this page Sep 9, 2022 · 18 revisions

Branching workflow

For this project, we will be making use of different types of branches, two long-lived branches; main and development.

  1. The main branch will contain the production code for the application - never branch of from here. Only the tech-lead (Mentor) will make changes here when appropriate.
  2. The development branch is where all new features will be developed i.e. you should only create a new branch from here.

The third type of branch will be the feature branches, which is where you will be working most of the time. As stated above, these feature branches should only be made from development and nowhere else.

There is no need to worry about the hotfix and release branches, this will be taken care of by the tech-lead (mentor)

Clone this wiki locally