Pull Request Workflow

• Before pull, make sure in the right branch using

$ git branch

• Checkout frontend/backend respectively to get the newest code using

$ git checkout frontend

or

$ git checkout backend

• Once on frontend/backend and ready to pull updates, use following:

$ git pull origin <branch_name>

• Checkout new branch for your assigned feature

$ git checkout -b my-new-feature-branch

• After change, use

$ git add .
$ git commit -m "a commit message in the present tense"

• Pull before push using

$ git pull origin my-new-feature-branch

If there are any conflicts, best to address them here.

• Push changes after there isn't any conflicts

$ git push origin my-new-feature-brach

• After finish the feature, please submit a pull request to frontend or backend respectively and resolve all conflicts over there. You can add a code viewer if you want someone to help you review the code.

• For more info, here are some documentation you can take a look. Github Basic, Collaborating on Projects with Git