☕ 🤖
FRC Team 3494's 2018 source code repository.
- Set up your tools and account.
- Run the proper gradle task for your IDE.
gradlew eclipse
for Eclipsegradlew idea
for IntelliJ
Build: gradlew build
Deploy: gradlew deploy
You can also add --offline
to either of those if you have no internet access (and have run any gradle command in the past with internet access.)
We are using git-flow, do that.
To familiarize yourself with git
, reference the tutorial Caleb provided. Below is the most likely command workflow, but you should be familiar with git so you can handle different situations. If you are using a GUI the names on the buttons should be similar to the commands below.
git checkout develop
git pull
git checkout -b <Name of feature>
git status
- Look to make sure the files changed are what you expect. You can use
git diff
if you want more information (andq<Enter>
to quit).
- Look to make sure the files changed are what you expect. You can use
git add --all
- This will add all the files (including new files) to the staging area to be committed. You can add individual files instead with
git add <Path to File>
- This will add all the files (including new files) to the staging area to be committed. You can add individual files instead with
git commit -m "<Message Describing Changes>"
- If you need to add a long/multiline commit message you can use
git commit
. Be warned, this by default will open vim, so if you don't know how to get out you may be stuck. (<ESC>:q<Enter>
will get you out in most cases.)
- If you need to add a long/multiline commit message you can use
git push
(orgit push -u origin HEAD
if it is the first time pushing your branch)
If it is a large feature you may want to create a PR through GitHub so that Caleb can review it. If it is a small feature, you can use the following to merge to develop.
git checkout develop
git pull
git merge --no-ff <Name of Feature Branch>
git push
- Cleanup by deleting the local and origin branch
git push origin --delete <Name of Feature Branch>
git branch --delete <Name of Feature Branch>
A fun git tutorial / game can be found here.