Skip to content

Commit 1006113

Browse files
committed
PROD-2161 #comment updated readme #time 5m
1 parent 6727455 commit 1006113

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,8 @@ When working on Jira tickets, we link associated Git PRs and branches to the tic
180180

181181
e.g.: `PROD-1516_work-issue`
182182

183-
The overall base branch is `develop`. Whenever a new epic is created and started working on, then a new epic branch is checked out from `develop` branch(for eg. like this `PROD-120_find-me-data`, in this case `PROD-120` is an epic). When a task/bug is assigned to a developer within a particular epic and when the developer starts working on the task/bug then the developer has to consider the epic branch(`PROD-120_find-me-data`) as base branch and create a new feature branch based on the above mentioned branch naming convention.
184-
185-
So basically the branch creation flow is like this `develop` -> `epic_branch` -> `feature_branch`. When merging we will merge `feature_branch` to `epic_branch` which in turn will be merged to `develop` branch.
183+
#### Branching strategy
184+
TBD
186185

187186
### Commits
188187
We use [Smart Commits](https://bigbrassband.com/git-integration-for-jira/documentation/smart-commits.html#bbb-nav-basic-examples) to link comments and time tracking to tickets. You would enter the following as your commit message:

0 commit comments

Comments
 (0)