Binghamton University Rover Team
Software
SoftwareMechanicalElectricalTroubleshootingTeam details
Software
SoftwareMechanicalElectricalTroubleshootingTeam details
  • Software Documentation
  • Overview
    • Architecture
    • Data format
    • Network
    • Our GitHub organization
  • Onboarding course
    • Git course
      • What is Git?
      • What is GitHub?
      • Merge Conflicts
      • Making your first commit
      • Adding more commits
      • Working with branches
      • Using GitHub
    • Arduino Course
    • Flutter course
    • Firmware Networking
    • Software Networking
  • Writing Code
    • Code conventions (Dart)
    • Code conventions (C++)
    • Documenting code
    • Advanced Git/GitHub
      • CI/CD
      • Git Submodules
      • Avoiding merge conflicts
      • Common problems
      • Restoring your changes
      • Squashing
    • Reviewing Code (admins)
  • Network
    • Protobuf
      • API Conventions
      • Working with Proto files
      • Generating code
      • Debugging Protobuf
    • UDP
      • Setting up the network
      • Troubleshooting
    • Serial
      • Troubleshooting
  • The Firmware
    • Introduction
    • Setting up your IDE
    • Firmware Utilities
    • TMC Motor Drivers
    • The different firmware
      • Arm
      • Science
      • Drive
      • Electrical
      • Antenna
  • The Software
    • Introduction
    • Pi Setup
      • UDev Rules
      • Configuring systemd
    • Burt Network
    • The different software
      • Subsystems
      • Video
        • Multithreading
        • OpenCV streaming
        • RealSense Streaming
        • Lidar Streaming
      • Autonomy
      • Computer Vision
      • Base Station
  • Dashboard
    • Introduction
    • MVVM Architecture
    • Design Philosophies
  • Appendix
    • Team Documentation
    • Open Source Contributions
    • Alternative Design Choices
      • ROS for Networking
      • Web Server on the Rover
      • C++ for Software
      • Python for Software
      • CAN Bus for firmware
  • Legacy docs
    • CAN bus
      • Setting up CAN on a Pi
      • Debugging CAN
Powered by GitBook
On this page

Was this helpful?

Edit on GitHub
  1. Writing Code
  2. Advanced Git/GitHub

Common problems

PreviousAvoiding merge conflictsNextRestoring your changes

Last updated 6 days ago

Was this helpful?

More resources

https://www.atlassian.com/git/tutorials/atlassian-git-cheatsheet