development
- all the implemented features which are done and deployedmaster
- stable version deployed
- Create a feature branch when you start to work on a story and commit your changes to this
- the branch should be named
<id of the ticket>: <subject>
, for exampleSMA 3 Add login endpoint
- the commits should also be named
<id of the ticket>: <subject>
, for exampleSMA 3 added unit tests
- the branch should be named
- Push this frequently to the remote repository from your local
- When the feature is done, create a Pull Request from the
feature_branch
todevelopment
, follow the guidelines - When the PR is approved, merge it, and delete your feature branch
Read this article how to write meaningful commit messages: How to Write a Git Commit Message
We follow the rules below:
- Commit message format:
SMA {id} <subject>
- id: Id of the ticket you are working on (in jira)
- Subject: Changes in the commit
- From
feature_branch
todevelopment
: add two developers and PM as reviewers, 3 approves needed for merging - From
development
tomaster
: this is managed by the PM