Overview
Ok y'all, since Chris's presentation on git branching last week, which is a game changer for us, I've been pondering how we could incorporate that into our present project workflow so all of us can gain a first hand exerience with it. I'm thinking we should use the next two weeks to do just that, and I have a plan I'll present in class on Tueday.
NOTE: I will be available for students interested in reviewing for a retake of the CPE this Saturday, December 13 from 9 am to 12 noon.
Thursday, December 11th
Classwork / Homework / Evaluation
Today in class we will work with Chris to merge the branches we made during last class into the main branch and then repeat the process.
Tuesday, December 9th
Classwork
It's that time again, NVCC Course Evaluations! Please visit https://nova.direct.iota360.cc, enter your VCCS email and your NVCC student number and complete your evaluations. NVCC will provide me with regular updates as to your participation rates, so I will nag relentlessly until you get this done :-)
Now that we have that out of the way, let's reorient ourselves. We have the following groups working on the following
- Curses Clock (with character based font): Evan, Sean, Robbie and Stephan
- Fraction Calculator: Delanie, Mason, Antoan and Nathan
- Robots Game: Giselle, Waleed, Dimitrios and Jeff
- Polynomial Calculator: Arya and Chris
Our broad goal for this project is to begin developing comfort with each of the following:
- C++ unit testing using Doctest
- Git branching and merging
- Makefiles
What To Do
- Select one member of your group to be added to the GCTAA group on Codeberg.
- That person should create move the current git repo for your project under this team, and add the rest of the group working on it to the project.
-
If you don't already have one, add a Makefile to your project that
supports both
make testandmake [run]. -
Break your group into two pairs, and determine what each pair
should be working on. Make an issue to track the work that each pair will do,
and then create a branch for each issue
(name it
<issue number>-<short, descriptive name>) and do today's work on that branch. -
Reminder: to create a new branch, you'll run this from the terminal:
git checkout -b <branch_name>
And then the first time you push, you'll need to run this (you can do this immediately, or wait for your first code push):git push --set-upstream origin <branch_name>
And if you want to checkout a branch your partner made, you'll run:git checkout <branch_name>
Homework
Make several commits to your branch, so that we can try to merge them during class on Thursday.