Workflow short

This page just tells you what to do. If you want an explanation of each step, see the extended version.

Cloning the master repository

$ git clone https://github.com/swcarpentry/boot-camps.git
$ cd boot-camps

Creating a new boot camp branch

$ git checkout -b 2012-12-my-camp origin/master

Developing boot camp content

Camp-specific content

$ …hack commit hack commit hack commit…
$ git push origin 2012-12-my-camp

General content

Put general content in feature branches (e.g. typo-fix, but pick a unique name):

$ git checkout -b typo-fix origin/master
$ …hack commit hack commit hack commit…
$ git push origin typo-fix
$ git checkout 2012-12-my-camp
$ git merge typo-fix

Make a pull request on GitHub to get your feature branch merged upstream. After the pull request is merged:

$ git branch -d typo-fix
$ git push origin :typo-fix

Post-boot-camp archival

$ git push origin 2012-12-my-camp

Then submit a pull request asking for a tag.