- Create a branch with the name of the feature you are working on. like
feature/feature-name
- After you are done with the feature, create a pull request to the
main
branch. - The pull request will be reviewed by the other members of the team.
- If the pull request is approved, it will be merged to the
main
branch. - Otherwise, the reviewer will give you feedback on what needs to be changed.
- After the pull request is merged, you can delete the branch.
We are using ESLint and Prettier to lint and format our code. You can run the following commands to lint and format your code:
npm run lint
npm run format
We are using Conventional Commits to write our commit messages. We also use Angular Commit Message Conventions for extra rules.
You can use the following command to generate a commit message:
npm commit
This will open a prompt where you can choose the type of commit, the scope of the commit, and the commit message.
Or once you have finished your commit message, you can run the following command to check if it is valid:
echo "your commit message" | npx commitlint
or
echo "your commit message" | commitlint
Or you can use git-commit-plugin for VSCode.
However, there is some extra configuration needed for this plugin to work with the newest Angular Commit Message Conventions.
Add the following to your settings.json
file:
{
"git-commit-plugin.CustomCommitType": ["ci", "build"]
}
and make sure you do not use the chore
type.
When you create a pull request, make sure you add the following information:
- What the pull request is about
- How to test the pull request
- What the reviewer should look for
- What the reviewer should test Please write the title using the commit message format.