Git Workflow

As we've just migrated from subversion, we're going to try to keep a subversion-style workflow on master. This means project members can all commit directly onto master, and we keep a linear history unless we actually mean to merge a branch.

A good start is Atlassian's Centralized Workflow guide

The only thing to add is that running "git pull" without the --rebase option will by default make a merge commit and a nonlinear history, so we should run "git config pull.rebase true" in your checkout to make that option the default. Or, just avoid git pull entirely and use "git fetch" and "git rebase" separately.