Update devteam practices after 1st sprint planning

This commit is contained in:
regularmute
2024-01-22 11:17:26 +02:00
parent 979568e8aa
commit 19b261105e
3 changed files with 6 additions and 16 deletions
+3 -2
View File
@@ -8,6 +8,7 @@ Developers, follow these instructions when you begin working:
- Check the main branch for any new commits.
- Check the GitHub repository for any [open pull requests](https://github.com/Ohtuilmo/ohtuilmo/pulls).
- Review and approve/reject any pull requests you can.
- Comment and reject PRs with a low barrier if you don't understand the reasoning behind a change. This way information is spread among more team members.
* Pull the latest changes to your local repository's main branch and the development branch(es) you are working on.
## When you start working
@@ -21,16 +22,16 @@ Developers, follow these instructions when you begin working:
* Create a pull request from the development branch to the main branch.
- Add a description of the changes you made.
- Add a link to the task in the description.
* Send a message to #dev Slack channel to have someone review your PR.
* Update the task in the [sprint board](https://github.com/orgs/Ohtuilmo/projects/1/views/9):
- Set the task to "Done".
- Mark used hours in "Time spent"
## When you finish working
* Push your changes to the development branch (git push origin <branch-name>).
* Record the time you spent working on the [sprint board](https://github.com/orgs/Ohtuilmo/projects/1/views/9) and the [working hours spreadsheet](https://docs.google.com/spreadsheets/d/1tVmQxNYNCB10zE99Bx8tBIaQDhb6cCLTTwZiMds9nYQ/edit#gid=940579879).
* If you want to share your unfinished progress, create a pull request with the DRAFT option to prevent anyone from merging it.
## When you are approving a pull request
* Check that the pull request follows the [conventional commit](https://www.conventionalcommits.org/en/v1.0.0/) format.
* Approve the pull request if it is ready to be merged.
* Merge the pull request to the main branch.
* Delete the feature branch.
+1 -12
View File
@@ -13,20 +13,9 @@
* Members aim to work on-site when possible.
* When working remotely, members are present in a Zoom-call and Slack during the agreed working hours.
* Members participate in the daily scrum and retrospective meetings, or respond to the transcript in Slack within the same day.
- If a member isn't working during the day, they notify the team in the daily-scrum channel on Slack.
* Demo member arrives by 8:30 for customer meetings to check the space and equipment.
* Other members arrive by 8:50 or earlier.
* Members notify the team in advance through Slack's general channel if they are unable to attend or arrive late to a meeting.
## Version control
* Use "conventional commits" for commit messages [(link)](https://www.conventionalcommits.org/en/v1.0.0/).
- "[type](optional scope): [description]
- e.g. "feat: display recorded hours to user on the front page"
- common types:
fix: patches a bug in the codebase
feat: a new feature
docs: changes to documentation
refactor: code changes that are not visible to the user
* Merge conflict are handled through rebasing.
* New features are developed in separate branches.
* Branches are merged to the main branch through pull requests. Anyone can merge a pull request after reviewing and approving it.
- Any open PRs are assigned for review during daily scrums.
+2 -2
View File
@@ -1,6 +1,6 @@
# Project Work Schedule
Customer meetings are held on Mondays 9:00-10:00. This is followed by sprint planning in Luola until 11:00.
Customer meetings are held on Mondays 9:00-10:00, with team members arriving by 8:50. This is followed by sprint planning in Luola until 11:00.
Luola is reserved for the following hours:
* Monday 9-12
@@ -11,4 +11,4 @@ Luola is reserved for the following hours:
Daily Scrums in Luola + Zoom at 9:30 on Tuesdays, Wednesday and at 10:30 on Fridays.
Retrospective in Luola + Zoom at 10:00-10:30 on Fridays.
Aim for a total amount of 18 hours per week per person, whether remote or on-site.
Aim for a total amount of 15 hours per week per person, whether remote or on-site. This includes meetings and retrospectives.