Commits
-
A commit explains one thing
-
Commit messages is in present
-
Start the message with the id of the branch you're in.
-
The message should describe what the branch does, not what you have done in the branch
Example: #8 Add tournament table
Branch Conventions
Issues are branched from dev and merged back into dev after completion.
Before a branch is merged into dev it will go through code review.
How to start working on a new issue:
Go to the issue on GitLab and press the down arrow by "Create Merge Request".
Make sure that the source branch is dev and that the branch name is <id>-<issue_name>
Press the green button "Create Merge Request and branch"
When a branch is finished and ready for merging, go to the correct merqe request and press "Resolve WIP status". Then, let other team members look over and approve the changes. When you're ready for merging, press "Merge".