-
Notifications
You must be signed in to change notification settings - Fork 6
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:
- Main/Master: This is for finalized, tested code
- Dev: Where we test code
- Feature Branches: Each feature gets one of these, which are created off of Dev and then merged into Dev when testing
- Competition: Each competition gets one of these, branched off of Main/Master. During comp, all our work goes on this branch.
This is an officially licensed product of Team 4026. Decatur Robotics 2024 is not sponsored by any other Team, and is not responsible for any damages caused by using this product or trusting the programming team, which is by far the least most trustworthy team(Shadow owen money gang, we love coding the robot). By using this product, you are consenting to your information, and thus your identity to be stolen and first-born child taken.
- Editing Documentation & Markdown Syntax
- Code Team to-do List
- Code Standards
- Common Library Structure
- Interfaces
- General Setup
- Branching System
- How to Create Pull Requests
- How to Switch Branches
- Code Reviews
- Reverting Commits
- Singleton Pattern
- Software Installations
- Necessary IntelliJ Plugins
- Vendordeps
- Setting Up New Projects
- Autoformatter Set Up
- Showbot Requirements
- Autonomous
- Calling a Command Based on a Button Press
- CAN
- Clearing Sticky Faults
- Current Limits
- PID Config and Usage
- Robot.java, TeleopInit, DisabledInit
- RoboRio Ports
- SetDefaultCommand
- Wait for Time
- SlewRateLimiter
- LEDs
- InstantCommand
- PhotonVision
- Apriltags
- Camera Display on Shuffleboard
- Object Detection
- Raspberry Pi
- Network Tables
- List of Network Tables (2023)
Up to date as of SJ2, end of 2023 season