- Fork this repo
- Open Eclipse
- Install the FRC eclipse plugin if you haven't already
File->Import...- If
Git->Projects from Gitis an option...- Choose
Clone URI URI:https://github.com/USERNAME/2016-Stronghold.git- Entering your username and password is optional
masterbranchImport existing Eclipse projects
- Choose
- If
Git->Projects from Gitdoes 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
- Make a new folder in your home folder named "workspace"
- Clone your fork
Window->Preferences->Java->Code Style- Clean Up
- Formatter
- Organize Imports
- For each, click
Importand browse to theextrafolder. Pick the appropriate file. Make sure Sponge is selected as the style for all three.
- 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
ito 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 importsordrivetrain: trigger the motors.- Press
escapeto exit "insert" mode, and go to "normal" mode. - Type
:wqto save and quit, or:q!if you want to cancel. If you use:q!, the commit won't be created.
- Press
- 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.