Git Workflow

Branching Workflow

• Fork the repo to your account
• Clone the forked repo to your dev machine
• Work from a (feature) branch, off the develop branch.
• Branch naming convention: <type-acronym>-<issue-number>-<short-title>, eg. ft-8-oath2-integration

Raising a PR

Before raising your PR:

• git rebase with our develop branch
• Run the tests and make sure they are passing
• Check for any linting issues, and have them fixed
• Raise the PR (fix any issues raised by the continuous-integration platforms)
• Wait for it to be merged by one of the team leads.