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

Update to v7.2 #2

Merged

Conversation

jlev
Copy link
Collaborator

@jlev jlev commented Sep 12, 2022

Create a new branch that tracked the upstream release candidate, and then merged those changes into our master. Then we can maintain our code and also have the latest and greatest API. Onward!

CalKestis and others added 2 commits July 23, 2022 13:50
…m/FIRST-Tech-Challenge/FtcRobotController into FIRST-Tech-Challenge-20220723-130006-release-candidate

# Conflicts:
#	FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/RobotAutoDriveByEncoder_Linear.java
#	TeamCode/build.gradle
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
@jlev jlev mentioned this pull request Sep 12, 2022
@jakeslye jakeslye merged commit d9b7c77 into master Sep 13, 2022
@jlev
Copy link
Collaborator Author

jlev commented Sep 14, 2022

Heads up @jakeslye, you'll want to do the same for v8.0 which was released yesterday. Want me to make another PR, or was this enough of an example?

@jakeslye
Copy link
Collaborator

jakeslye commented Sep 15, 2022

Heads up @jakeslye, you'll want to do the same for v8.0 which was released yesterday. Want me to make another PR, or was this enough of an example?

I got it done 👍 Thanks!

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.

3 participants