<aside> 💡 This page documents the development process engineers should follow at Devs-101 organization. Helpful for getting the new team members up to speed.

</aside>

Git workflow

We use git flow as git/github workflow. You can read more about it here:

Gitflow Workflow | Atlassian Git Tutorial

Github branch structure

• master is the production branch. It should always be ready for prod.
• develop is the main development branch. You should NEVER push commits directly to this branch.
• T#/name-of-the-feature are the branches you should create for your tasks. This branch comes from develop branch. Each task is associated with a GitHub issue. The # next to the T correspond to the number of the GitHub issue.
• release branch is the branch where the code that is up to be released is tested. It is related to a staging environment for QA process.
• hotfix#/name-of-the-issue are branches you should create for doing a hot fix. This branch comes from master branch. Each task is associated with a GitHub issue. The # next to the hotfix correspond to the number of the GitHub issue.
• bug#/name-of-the-issue are branches you should create for solving a bug. This branch comes from release branch. Each task is associated with a GitHub issue. The # next to the bug correspond to the number of the GitHub issue.

1. Create a branch off of develop

Name the branch with the GitHub issue number name pre-pended: T1/create-login-page

2. Writing code

You can develop and do any commit you consider necessary for your development. Remember each commit has a prettier and eslint hook, so make sure everything is according code style guide. Once you are done, prepare for push your changes.

3. Push your changes

Before sending a push to the repo, make sure there are no conflicts with the destination branch. You can do it by running:

git pull --rebase origin develop

This command will bring all changes to your local branch, but will place your commits on top of the incoming changes.