Branching Strategy

Overview

This page describes basic process of working with branches. This guide is more like recommendation than a must have but following it will help manage repository easier.

Main goals

Branching strategy has been selected to meet following goals:

• Reviewing code at task level - we don't have any dedicated code review tool so we use pull requests to share feedback.
• Keep master stable: we merge into master only reviewed and verified features.

Strategy

Story workflow (issues with tag "type:feature", "type:enhancement")

1. For each story create a branch with corresponding name.
2. For each task create a branch with corresponding name. (can be omitted if story has no tasks)
3. When work on task complete PR to story branch should be created. Tasks should be small so PR can be reviewed faster.
4. After PR approved branch is merged and deleted.
5. When all tasks are complete PR to master is created.
6. After PR is approved it is merged and story branch is deleted.

Bug/Defect workflow (issues with tag "type:bug")

1. Create a branch.
2. After defect is fixed PR is created to merge into master
3. When PR is approved it is merged and branch is deleted.

Important

Delete branch after it is merged to keep repository clean