Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corolling skeleton #16

Merged
merged 6 commits into from
Jan 21, 2025
Merged

Corolling skeleton #16

merged 6 commits into from
Jan 21, 2025

Conversation

Unclesdad
Copy link
Contributor

had to make some mini subsystems for the coroller and for the arm since they are used inside of Corolling.java

Copy link
Contributor

@sigalrmp sigalrmp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMPORTANT WAY TO AVOID MERGE CONFLICTS: Make sure you merge the coroller and arm skeletons first!!!! And then delete the arm and coroller files from this branch, and merge in main. And then we'll re-approve this pr you can merge it. Lmk if that doesn't make sense

@sigalrmp sigalrmp requested a review from kishan243 January 20, 2025 16:58
@z0nk9 z0nk9 merged commit cebaf9b into main Jan 21, 2025
2 checks passed
@z0nk9 z0nk9 deleted the corolling-skeleton branch January 21, 2025 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants