Lecture 27

Lecture 27, Mon 12/07

Monday: Standup meeting, Quick Retrospective (reviewing CATME data) PR Review / planning

A few notes:

PRs will NOT be code reviewed until they are green on CI
If you have a PR with a red X, work on getting it green
- If you need help ask for help with that!
Two code reviews are needed: one from a peer on your team, and another from staff
If you have changes requested, get those done asap
If your PR has merge conflicts, you need to fix those.
- The staff can guide you through that process.
PR name should be descriptive, not just “issues 34 and 35”. Say what issues 34 and 35 are.

Rebasing your branches

Periodically, you should rebase on main. You shoudl CERTAINLY do this before you do a PR, and if your branch shows as “out of date with main”.

You can do this in the GitHub Web interface if it’s a simple merge.

But if there are merge conflicts, it’s better to do it at command line:

git pull --rebase origin main

Then after you resolve the conflicts:

git push origin branch-name -f

You may want to get a staff member to help you through this the first time.

Take time to review the peer feedback on CATME if you haven’t yet.
Everyone open the team slack chat
Everyone write a message that has three things in it. DON’T HIT ENTER until everyone says that they are done.
- Stop: What is something we are doing that we should stop doing (to improve)
- Start: What is something we are doing that we should start doing (to improve)
- Continue: What is something we are doing that we should continue doing (because it’s going well) If you can’t think of both a start and stop, just one of the two is fine.
On signal from group leader, everyone hits enter.
Read through what people wrote, and discuss.