Skip to content

Commit 01b5dc9

Browse files
committed
Merge branch 'robolancer_updates' of https://github.com/RoboLancers/FRC-Java-Tutorial into robolancer_updates
2 parents 18cdd30 + e1b40b3 commit 01b5dc9

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

.github/workflows/Deploy_site.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: Deploy Site
22
permissions:
33
contents: write
44
on:
5-
pull_request:
6-
branches:
7-
- robolancer_updates
8-
#push:
9-
# branches:
10-
# - robolancer_updates
5+
# pull_request:
6+
# branches:
7+
# - robolancer_updates
8+
push:
9+
branches:
10+
- robolancer_updates
1111
jobs:
1212
build:
1313
runs-on: ubuntu-latest
File renamed without changes.
25.1 KB
Loading

docs/index.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
[![FIRST](assets/images/logos/first.png)](https://www.firstinspires.org/robotics/frc/){target=_blank}
44

5-
The unofficial FIRST Robotics Competition Java Programming Tutorial.
5+
The unofficial FIRST Robotics Competition Java Programming Tutorial for FRC Teams 321 and 427, the Robolancers
66

77
!!! Info
8-
Updated for the 2021 Season
9-
Last updated: 9/30/21
8+
Updated for the 2026 Season
9+
Last updated: 1/9/2026
1010

1111
**Disclaimer:** Some screenshots may have different colors, icons, more/less folders/files than you due to themes or personal settings. This is normal and should not impact the tutorial. If you still have any questions please contact us.
1212

@@ -18,6 +18,7 @@ The unofficial FIRST Robotics Competition Java Programming Tutorial.
1818

1919
| Name | Team | Team Role |
2020
| :----------------------------------------------: | :--------------------------------------------: | :-------: |
21+
| Carl Stanton | [321](https://robolancers.com/){target=_blank} | Mentor
2122
| [Tayler Uva](https://Tayler.Tech){target=_blank} | [3255](https://SuperNURDs.com/){target=_blank} | Coach |
2223
| Isaac Sayasane | [3255](https://SuperNURDs.com/){target=_blank} | Alumni |
2324
| Sharon Riggs | [6995](https://frc6995.org){target=_blank} | Mentor |

docs/version_control/BasicGit.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ For more information, see the [full reference guide to git commands](https://git
5454
## Git Log
5555

5656
>Git log is a tool to view your history in Git. By default Git Log shows all of the commits in the repository, ordered from newest to oldest. in VSCode, the graph panels shows the Git log/History in a visual way.
57+
5758
![Graph view in VS code](../assets/images/vscode_tips/git_graph_vscode.png)
5859

5960
## Github Setup
@@ -65,7 +66,7 @@ Github is a website that hosts Git repositories. The Robolancers store all of th
6566

6667
## Examples
6768

68-
![A simple demonstration of committing and pushing some changes in git](../assets/images/vscode_tips/GitExample.png)
69+
![A simple demonstration of committing and pushing some changes in git](../assets/images/git/GitExample.png)
6970

7071
- Typing `git add .` then `git commit -m "commit name"` then `git push` is the bread and butter of using Git.
7172
This sequence tells Git to collect all of your uncommitted changes, commit them, then push them to Github.
@@ -76,7 +77,7 @@ Github is a website that hosts Git repositories. The Robolancers store all of th
7677
- `git status` displays the current branch and what changes you have uncommitted and staged
7778
- `git pull` updates the code on your device with the latest code from Github.
7879
Recommended to do this whenever someone else has been working on the same branch, otherwise you might make conflicting changes
79-
- [A simple demo video of committing some changes](../assets/images/vscode_tips/GitDemoVideo.mp4)
80+
- [A simple demo video of committing some changes](../assets/images/git/GitDemoVideo.mp4)
8081

8182
## Managing Git in Vscode
8283

0 commit comments

Comments
 (0)