Skip to content

Working with us as a team member

Anthony Akentiev edited this page Jun 23, 2018 · 4 revisions

Working with us as a team member

Working with us as a team member gives you WRITE access to our Task Tracker. So you will be able to move, delete or add new tasks.

Each commit should be assigned to the task. To do that you should add the task number to your commit message. Github will then automatically connect the commit with the task. Please see below.

  1. Before you go we should add you to the Thetta team members: Team Members picture

  2. Clone the repository to your computer. Now your origin points to OUR repository.

  3. We work in the dev2 branch. Switch to it.

git fetch origin
git checkout dev2
git pull origin dev2
  1. Create your own branch to work in. We do not allow to push DIRECTLY to dev2.
# Create new branch
git checkout -b john-doe-branch
  1. Build
npm install
  1. Run all tests. Test should pass.
npm run test
  1. Now check the task tracker. You should move the task to 'In progress'. DO NOT WORK without opening the task! Even if this is a minor change -> better to open new task. For example: Tasks picture

  2. Now write the code. Don't forget to write or update tests.

  3. Run all tests before committing. They should pass.

npm run test
  1. Now commit your changes:
git commit -a -m "I fixed the bug #42. Wrong number of arguments in the Voting constructor"
  1. Ok. Now push your commits to OUR repository on the github.
# Pushing to john-doe-branch branch
git push origin john-doe-branch
  1. Once code is pushed to YOUR repository -> create new Pull Request FROM john-doe-branch (thats your branch) TO the dev2 branch. Pull Request

  2. You SHOULD request the code review. We do not allow to merge the Pull Request without it going through the code review. During the code review we can ask you for some changes or will write you some comments.

  3. Move task to 'In review' column

  4. Once code review is complete -> we will merge your Pull Request to the dev2 branch.

You can continue working in your branch. Just make sure that you merge the changes from the dev2 TO your branch quite often.

Clone this wiki locally