Skip to content

Branching

Lyndon Warren edited this page Oct 24, 2023 · 18 revisions

Branching

On GitHub, our repositories consist of multiple versions of code across the multiple iterations of it. Branches are used to organize certain shifts in time in order to keep the code base as organized as possible.

To start, all github projects have a "main" branch. When a new branch is made, it "branches" off of an existing one.
Ex: we could make a "dev" branch that starts off with all of the code from "main", the update it separately from "main"

Developing on several branches needs to be for a purpose, so we organize our types of branches as follows. We use 4 types of branches:

  1. Main/Master: This is for finalized, tested code
  2. Dev: Where we test code
  3. Feature Branches: Each feature gets one of these, which are created off of Dev and then merged into Dev when testing
  4. Competition: Each competition gets one of these, branched off of Main/Master. During comp, all our work goes on this branch.

Clone this wiki locally