Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Branching - Getting It Right for Us

Branching - Getting It Right for Us

Sometimes the way you do it is not the way we do it...

Luke van der Hoeven

August 30, 2013
Tweet

More Decks by Luke van der Hoeven

Other Decks in Programming

Transcript

  1. • Active, in-progress work • New code is always done

    in a feature branch • Contains an independent, fully-functional feature What Is: Feature
  2. • Contains code being prepared for release • Made up

    of merges from feature branches • No active work ongoing. What Is: Release
  3. What’s Going On • QA starts testing the release •

    Developers are working on the feature branches • Life is good...
  4. If the bug is with Feature A, where does the

    fix go? QA starts testing here, finds bug...
  5. The Rules • All work is done in feature branches

    • All release branches must be branched from master • Master contains only released code
  6. An Important Note • Merge direction is critical to keeping

    code isolated • Releases only merge down to master or from features. • Features only merge up from master