Everything should be written in english (even comments).
We use camelCase
in the code and snake_case
in the databse.
You need to create a branch from dev
:
git switch -c <your_branch_name>
git checkout -B <you_branch_name>
On each Linear issue, you can associate a Git branch corresponding to feature/identifier-title
. To make this easier, you can copy the branch name via cmd + shift + .
or use the branch icon directly on the issue.
git commit -m "[<ticket_number>] <fix/feat>: small description of what you have done"
Push your latest change on your branche:
git push
Switch to the branch you want merge:
git checkout <dev?>
pull dev
(or the target branch):
git pull dev
Checkout again on your feature branch
git checkout <your_feature_branch>
Merge dev into your feature branche :
git merge dev
Resolve conflits and push and PR: