Branches

• master
  • The basis for the 1.y.z series (e.g. 1.6.2).
• 0.y.z
  • The basis for the 0.y.z series (e.g. 0.10.2).
  • master will be repeatedly merged into this. (In the past, we rebased this onto master.)
• private-0.y.z
  • A private branch, repeatedly rebased to master. This will always match 0.y.z, but with a much cleaner history. It helps us to avoid merge mistakes.