Tapestry

h1. Development cycle

h2. Writing and contributing code

Start a branch like username/master or username/rails3

 git branch example/rails3

git checkout example/rails3

Do something trivial like

* add app/views/pages/specimen_collection.html.erb

* add link to it in app/views/pages/home.html.erb

Commit it

 git add ...

git commit -m '...'

Push it

 git push

Generate a pull request

 git request-pull e68ab19^ git@git.clinicalfuture.com:pgp-enroll.git e68ab19

Send the pull request to someone like Ward

h2. Merging code from other contributors/branches

Get latest stuff

 git pull

Check out master branch (or whatever branch you want to pull the new code into)

 git checkout master

Cherry-pick a commit

 git cherry-pick e68ab19

Push

 git push