Key Points:
- DO NOT push directly to the
mainbranch. - Create a new branch for your feature or bugfix (e.g.,
feature/new-logging-utilorfix/swerve-bug) usingdevelopas your source branch - Submit a Pull Request (PR) and request a review from a mentor and other programmers AFTER a succesful simulation to merge your code back into
develop
This map shows how our code travels from your brain to the robot's "brain" on the field. Think of the Main and Develop lines as a permanent history of our team's progress.
The Lab (Top): Individual student work happens in the pink boxes. This is where we break things and learn. Code here is "untrusted" until it is reviewed and merged into Develop.
The Integration (Middle): The blue line is our "Team Truth." It’s what we use for shop nights and practice sessions (yellow boxes). Before any competition, we "freeze" the best version of this code and move it down to Main.
The Field (Bottom): The green line is sacred. At an event, we create a specific COMP branch. Any changes made in the pits are committed here and immediately Tagged (the blue boxes).
Why the Tags? These are "Save Points." If the robot stops working during Qual 2, we can instantly look back at the Qual 1 tag to see exactly what changed. This ensures we never lose a working version of the robot in the heat of competition.
Pit Commands:
-
New Fix:
git checkout -b fix/logic-error -
Apply Fix:
git checkout COMP-03-05 -> git merge fix/logic-error -
Tag Match:
git tag -a Qual-1 -m "Short description"