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

Git Flow

528c708e08d6011fc90d3e17876c65b9?s=47 Sarmad Sangi
September 17, 2014

Git Flow

528c708e08d6011fc90d3e17876c65b9?s=128

Sarmad Sangi

September 17, 2014
Tweet

Transcript

  1. Git Flow

  2. Why are we talking about this ? • We are

    growing rapidly geographically • Multiple people per platform • Maintain and Improving code quality • Reduce conflicts
  3. Git Flow • Branching • Pull Requests • Releases •

    Merge Masters
  4. Git Flow - Branching

  5. Git Flow - Pull Requests • Helps review code •

    Forces us to write good quality code • Shows you if build is failing or has passed (Travis) • Promotes transparency
  6. Git Flow - Releases • Create a Tag for a

    release • Release notes
  7. Git Flow - Merge Masters • Responsible for merging Pull

    requests • Anyone and everyone can be merge master
  8. How not to screw up ? • Never do git

    push - - force
  9. How not to screw up ? • Never do git

    push - - force
  10. How not to screw up ? • Avoid committing into

    master branch directly even during hot fix.