# Conventions

## Naming branches in git

Since we using [trunk based development](https://trunkbaseddevelopment.com/) as our workflow, we try to merge code daily and not have any long running "feature branches".

### Daily branches

Daily branches have the developer's initials, the date, and a small title. For e.g.: Asha Kumari making a branch on 12th April to work on "updated search algorithm", should name the branch something like `ak/12apr/update-search-algo`. This gently nudges the developer to merge the branch in a day or two, since this is just a convention and not enforced in any manner.

### Release branches

Release branches are automatically cut when we create a new release from Tramline, new branch will be named `r/release` followed by the date on which the release is triggered. For example, the release branch cut on 10th December 2018 will be named `r/release/2018-12-10` .