git and How Team 973 Programs

An overview of git and how we use it on FRC team 937.

A Note on Capitalization:

git is intentionally not capitalized here because its proper name is in lowercase, since it is a command-line tool.

Introduction

This is the fourth and final part of our FRC programming crash course, which will go over git, GitHub, and some basic procedures for how we program on FRC Team 937.

git

We use git as our version control system. If you don't know what version control is, don't worry—we'll cover it in a moment.

We recommend this wonderful video to learn git:

Or a text version of the same video available here:

Don't worry about following along, installing git on your machine, or memorizing the exact commands. We'll get you started with a git GUI in a bit, so you won't need to know the exact command-line syntax—just the high-level concepts. We'll also help you install git on your machine, since installing it on the school computers can be tricky.

As a minor correction, the primary branch is now called "main" by default.

GitHub

We use GitHub to host our git repositories, provide CI/CD through GitHub Actions, and manage Pull Requests.

We recommend this wonderful video to learn the basics of GitHub:

Or the text version of the video available here:

How Team 937 Programs

Generally, each year, we'll roughly follow this paradigm:

Create a new command-based robot project and upload it to a GitHub repo. Name the project and the repo robotXXXX, with XXXX being the year of the season (so robot2024 for the 2024 season robot)
Plan out which programmers are going to implement which features and/or bugfixes
Programmers each make a topic branch (or branches) within the original GitHub repo (no need to fork) for each feature/bugfix
Once the feature or bugfix is implemented, the programmer creates a PR and student leadership reviews it
Rinse and repeat steps 2-4 until the robot is good to go!

More information about our programming norms and how we program can be found here:

Programming Norms

PreviousCommand-Based Programming NextUseful Links

Last updated 9 months ago

git

We use git as our version control system. If you don't know what version control is, don't worry—we'll cover it in a moment.

We recommend this wonderful video to learn git:

Or a text version of the same video available here:

As a minor correction, the primary branch is now called "main" by default.

How Team 937 Programs

Generally, each year, we'll roughly follow this paradigm:

Create a new command-based robot project and upload it to a GitHub repo. Name the project and the repo robotXXXX, with XXXX being the year of the season (so robot2024 for the 2024 season robot)

Plan out which programmers are going to implement which features and/or bugfixes

Programmers each make a topic branch (or branches) within the original GitHub repo (no need to fork) for each feature/bugfix

Once the feature or bugfix is implemented, the programmer creates a PR and student leadership reviews it

Rinse and repeat steps 2-4 until the robot is good to go!

More information about our programming norms and how we program can be found here:

Programming Norms