Git Flow

Git Flow

Using Git Flow to solve common Git problems.

71f946b4fdeb8a14e43297b2708e4c3a?s=128

Rodrigo Espinosa Curbelo

August 15, 2014
Tweet

Transcript

  1. 10.
  2. 14.

    Production Free of bugs Introduce only “such a tested” feature

    
 Push hot fixes as priority Secure environment No directly interaction
  3. 15.

    Staging Try features It won’t heart to have bugs
 Fix

    them before merging to master Policy “What is mind? No matter. What is matter? Never mind.”
  4. 17.
  5. 20.

    • Pull dev, start coding and then pushing the branch.

    • Once in awhile merge dev with sta and deploy. • If something is not working on staging, fix it in that branch. • If everything under staging is working, merge and push to master, deploy to production. Introducing features
  6. 21.

    • Pull dev, start coding and then pushing the branch.

    • Once in awhile merge dev with sta and deploy. • If something is not working on staging, fix it in that branch. • If everything under staging is working, merge and push to master, deploy to production. Introducing features
  7. 23.

    • Create a new branch base on staging. • If

    it is needed for collaboration, push the feature branch to origin. • After it is done (and tested), merge it to staging. • Then, delete the feature branch. Introducing features
  8. 25.
  9. 31.
  10. 35.

    • A hotfix is a fix to be done under

    production. • Create a new branch base on master. • Code the fix and the merge it to master and sta. • After the two merges, delete the hotfix branch. Introducing hotfixes
  11. 43.
  12. 51.
  13. 55.