View Code? Open in Web Editor
NEW
This project forked from spartronics4915/2016-stronghold
2016 FRC robot code
Home Page: http://spartronics4915.com
License: MIT License
Java 49.28%
Python 49.53%
HTML 0.80%
Shell 0.39%
2016-stronghold's Introduction
![tag](https://camo.githubusercontent.com/1bfef2728a7faedfafd4f301d8c2fcd810cf528c6c3434e397e1c9f40acf4b2c/68747470733a2f2f696d672e736869656c64732e696f2f6769746875622f7461672f5370617274726f6e696373343931352f323031362d5374726f6e67686f6c642e737667)
- Fork this repo
- Open Eclipse
- Install the FRC eclipse plugin if you haven't already
File
-> Import...
- If
Git
-> Projects from Git
is an option...
- Choose
Clone URI
URI
: https://github.com/USERNAME/2016-Stronghold.git
- Entering your username and password is optional
master
branch
Import existing Eclipse projects
- If
Git
-> Projects from Git
does not appear...
- Clone your fork
- Make a new folder in your home folder named "workspace"
$ mkdir ~/workspace
$ git clone https://github.com/USERNAME/2016-Stronghold.git ~/workspace/2016-Stronghold
- Choose
General
-> Existing Projects into Workspace
Select root directory
: Home/workspace/2016-Stronghold
Window
-> Preferences
-> Java
-> Code Style
- Clean Up
- Formatter
- Organize Imports
- For each, click
Import
and browse to the extra
folder. Pick the appropriate file. Make sure Sponge is selected as the style for all three.
Development Flow Post-Setup
- Create a new branch for your feature:
$ git checkout -b branch-owner-username/new-branch-name
- Make your changes
- Use
$ git add -- file1 file2 file3...
to "stage" your changes
- Begin to make a commit with
$ git commit
.
- Edit the commit message. The default editor,
vi
, is really intimidating, but simple to write a message with.
- Press
i
to enter "insert" mode. Any buttons you push outside of insert mode will usually be interpreted as commands, and do unexpected things.
- Write your message. Here's a really great guide: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
- The summary (first line) of your commit message should follow this format:
section: short change description
, like so: formatting: organize imports
or drivetrain: trigger the motors
.
- Press
escape
to exit "insert" mode, and go to "normal" mode.
- Type
:wq
to save and quit, or :q!
if you want to cancel. If you use :q!
, the commit won't be created.
- Rinse and repeat! When you're done making commits, move on.
- Push your changes to your fork with
$ git push
- Create a pull request by visiting your fork's webpage on GitHub and clicking the green button.
- Add a description, and be sure to mention whether you've tested the code.
- Bug a leader to merge your request.
- It may be rejected, or be commented on with requests to change things.
- You can keep committing and pushing to a branch that has an active pull request -- your commits will be automatically added to the pull request.
2016-stronghold's People
Watchers