Skip to content
Fetching contributors…
Cannot retrieve contributors at this time
47 lines (24 sloc) 1.63 KB

Given the size and nature of the project we will have a single branch from which we work called master.

Before you begin, clone our repository. This only needs to be done once but can be done as many time as you'd like. But be cautious about cloning into an already existing git repository. You will do all of your work within the folder created by git clone.

git clone

Generally, you will want to go through the following cycle for work corresponding to a couple of hours of work - generally a single additional feature or bug fix.

--== Session Workflow ==--

  1. Begin by updating your master branch to catch up with any changes that have been made by other team members since your last session:

git pull origin master

  1. Create a branch from which to work.

git checkout -b

example: git checkout -b asb_20120912_addedclownclass

  1. Do your work.

  2. You may wish during your work to keep up with any changes that have been made since you began work on your branch:

git commit -m ""

git checkout master

git pull

git checkout

git rebase master

  1. When your work is complete, add your files, commit and push to the github repository:

git add . git commit git push origin master

Note that git commit will launch a text editor. Be as detailed as you can about what was done and uncomment the files that were added and removed (automatically added to the text file by git).

  1. Send an email to the group to let us know that you've added a branch. I will then merge your branch into the master.

  2. Repeat.

Something went wrong with that request. Please try again.