Git Workflow

MAKE SURE YOUR REMOTES ARE SET-UP
=================================
git remote -v                            check to see your remotes. if you don't have upstream and/or origin set then run
    git remote add origin http://github.com/<your-username>/oaa
    git remote add upstream http://github.com/openangelarena/oaa
if you have remotes setup, but you want to switch aliases, you'll likely want to set new urls with:
	git remote set-url <some-alias> http://github.com/openangelarena/oaa

BRING YOUR LOCAL UP-TO-DATE
=================================
git checkout master                       make sure you're in master
git fetch upstream                        get the latest snapshop from oaa
git reset --hard upstream/master          apply the lastest snapshot to master. if you're in the middle of a branch and need/forgot to update, just run this instead:
    git merge upstream/master

NOW START YOUR WORK HERE
=================================
git checkout -b <name-of-branch>          creates a new branch
<do some changes>
git status                                shows you what you changed

SUBMIT YOUR CHANGES
=================================
git add --all                             if you're satisfied with your changes, you add them to staging
git commit -m "description"               commit
git push origin <name-of-local-branch>          push your changes to your remote (origin)
<then just go to github.com and do a pull request>

WORKING IN SOMEONE ELSE'S BRANCH
=================================
git remote add <other-persons-account> http://github.com/<other-persons-account>/oaa
git checkout -b <some-name>               create a branch to work in locally
git fetch <other-persons-account>         retrieves the remote repository's snapshots
									      Next, merge the desired snapshot:
git merge <other-persons-account>/<other-persons-branch>
                                          <do some work>
                                          Now do the following to submit your work to your github account for PR.
git add --all; git commit -m "description" git push origin <name-of-local-branch>
                                          In order to actually submit your PR, do the following:
1. Go to the other person's account/oaa page.
2. Click "New Pull Request"
3. Set the Base fork/branch to <other-person's-account>/<other-person's-branch>
4. Set the Head fork/branch to <your-account>/<your-branch>
5. Click "Create Pull Request"