Your SlideShare is downloading. ×
Git flow
Upcoming SlideShare
Loading in...5
×

Thanks for flagging this SlideShare!

Oops! An error has occurred.

×

Introducing the official SlideShare app

Stunning, full-screen experience for iPhone and Android

Text the download link to your phone

Standard text messaging rates apply

Git flow

1,136
views

Published on

Published in: Technology, Business

0 Comments
7 Likes
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total Views
1,136
On Slideshare
0
From Embeds
0
Number of Embeds
2
Actions
Shares
0
Downloads
73
Comments
0
Likes
7
Embeds 0
No embeds

Report content
Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
No notes for slide
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • Transcript

    • 1. git-flowa successful branching model
    • 2. branching model
    • 3. decentralized but centralized
    • 4. origin
    • 5. origin
    • 6. origin
    • 7. origin
    • 8. origin
    • 9. origin
    • 10. origin
    • 11. origin
    • 12. origin
    • 13. origin
    • 14. origin
    • 15. origin
    • 16. origin
    • 17. origin
    • 18. originsubteamfetches
    • 19. originsubteamfetches
    • 20. originsubteam subteamfetches fetches
    • 21. originsubteam subteamfetches fetches
    • 22. subteam fetches originsubteam subteamfetches fetches
    • 23. subteam fetches originsubteam subteamfetches fetches
    • 24. subteam fetches originsubteam subteamfetches fetches
    • 25. subteam fetches originsubteam subteamfetches fetches
    • 26. the main branches
    • 27. production-ready statedevelop master
    • 28. production-ready statedevelop master
    • 29. production-ready statedevelop master
    • 30. production-ready statedevelop master versão inicial de prod
    • 31. production-ready statedevelop master versão inicial de prod
    • 32. production-ready statedevelop master versão inicial de prod
    • 33. production-ready statedevelop master versão inicial de prod
    • 34. production-ready statedevelop master versão inicial de prod
    • 35. production-ready statedevelop master versão inicial de prod
    • 36. production-ready statedevelop master versão inicial de prod
    • 37. production-ready statedevelop master versão inicial de prod
    • 38. production-ready statedevelop master versão inicial de prod
    • 39. production-ready statedevelop master versão inicial de prod
    • 40. production-ready statedevelop master versão inicial de prod próximo release em prod
    • 41. production-ready statedevelop master versão inicial de prod próximo release em prod
    • 42. production-ready statedevelop master versão inicial de prod próximo release em prod
    • 43. production-ready statedevelop master versão inicial de prod próximo release em prod
    • 44. production-ready statedevelop master versão inicial de prod próximo release em prod
    • 45. production-ready statedevelop master versão inicial de prod próximo release em prod
    • 46. production-ready statedevelop master versão inicial de prod próximo release em prod
    • 47. production-ready statedevelop master versão inicial de prod próximo release em prod
    • 48. production-ready statedevelop master versão inicial de prod próximo release em prod próximo release em prod
    • 49. production-ready statedevelop master versão inicial de prod próximo release em prod próximo release em prod
    • 50. production-ready statedevelop master versão inicial de prod próximo release em prod próximo release em prod
    • 51. production-ready state develop master versão inicial de prod próximo release em prodWIP para próximopróximo release em release prod
    • 52. supporting branches
    • 53. • Feature branches• Release branches• Hotfix branches
    • 54. feature branches
    • 55. •branch off from: develop•merge back into: develop•branching name convention, except: •master •develop •release-* •hotfix-*
    • 56. feature developbranches
    • 57. feature developbranches
    • 58. feature developbranches
    • 59. feature developbranches
    • 60. feature developbranches
    • 61. feature developbranches início desenv. nova feature
    • 62. feature developbranches início desenv. nova feature
    • 63. feature developbranches início desenv. nova feature
    • 64. feature developbranches início desenv. nova feature
    • 65. feature developbranches início desenv. nova feature
    • 66. feature developbranches início desenv. nova feature
    • 67. feature developbranches início desenv. nova feature
    • 68. feature developbranches início desenv. nova feature
    • 69. feature developbranches início desenv. nova feature
    • 70. feature developbranches início desenv. nova feature
    • 71. feature developbranches início desenv. nova feature
    • 72. feature develop branches início desenv. nova feature fim desenv.nova feature
    • 73. feature develop branches início desenv. nova feature fim desenv.nova feature
    • 74. feature develop branches início desenv. nova feature fim desenv.nova feature
    • 75. feature develop branches início desenv. nova feature fim desenv.nova feature
    • 76. feature develop branches início desenv. nova feature fim desenv.nova feature feature integrada
    • 77. branching off$ git checkout -b myfeature developSwitched to a new branch “myfeature”merging into$ git checkout developSwitched to branch “develop”$ git merge --no-ff myfeatureUpdating ea1b82a..05e9557(Summary of changes)$ git branch -d myfeatureDeleted branch “myfeature” (was 05e9557).$ git push origin develop
    • 78. branching off$ git flow feature start myfeatureSwitched to a new branch “myfeature”merging into$ git flow feature finish myfeatureSwitched to branch “develop”Updating ea1b82a..05e9557(Summary of changes)Deleted branch “myfeature” (was 05e9557).
    • 79. release branches
    • 80. •branch off from: develop•merge back into: develop and master•branch name convention: •release-*
    • 81. branching off$ git checkout -b release-1.2 developSwitched to a new branch “release-1.2”merging into$ git checkout masterSwitched to branch “master”$ git merge --no-ff release-1.2Merge made by recursive.(Summary of changes)$ git tag -a 1.2$ git checkout developSwitched to branch “develop”$ git merge --no-ff release-1.2
    • 82. branching off$ git flow release start 1.2Switched to a new branch “release-1.2”merging into$ git flow release finish 1.2Merge made by recursive.(Summary of changes)Deleted branch “release-1.2” (was f105d3).
    • 83. hotfix branches
    • 84. •branch off from: master•merge back into: develop and master•branch name convention: •hotfix-*
    • 85. develop hotfixes master
    • 86. develop hotfixes master
    • 87. develop hotfixes master
    • 88. develop hotfixes master tag 1.2
    • 89. develop hotfixes master tag 1.2
    • 90. develop hotfixes master tag 1.2
    • 91. develop hotfixes master tag 1.2
    • 92. develop hotfixes master tag 1.2
    • 93. develop hotfixes master tag 1.2
    • 94. develop hotfixes master tag 1.2
    • 95. develop hotfixes master tag 1.2
    • 96. develop hotfixes master tag 1.2
    • 97. develop hotfixes master tag 1.2
    • 98. develop hotfixes master tag 1.2
    • 99. develop hotfixes master tag 1.2
    • 100. develop hotfixes master tag 1.2
    • 101. develop hotfixes master tag 1.2 bug em prod corrigido
    • 102. develop hotfixes master tag 1.2 bug em prod corrigido
    • 103. develop hotfixes master tag 1.2 bug em prod corrigido
    • 104. develop hotfixes master tag 1.2 bug em prod corrigido
    • 105. develop hotfixes master tag 1.2 bug em prod corrigido
    • 106. develop hotfixes master tag 1.2 bug em prod corrigido
    • 107. develop hotfixes master tag 1.2 bug em prod corrigido
    • 108. develop hotfixes master tag 1.2 tag 1.2.1 bug em prod corrigido
    • 109. develop hotfixes master tag 1.2 tag 1.2.1 bug em prod corrigido
    • 110. develop hotfixes master tag 1.2 tag 1.2.1 bug em prod corrigido
    • 111. branching off$ git checkout -b hotfix-1.2.1 masterSwitched to a new branch “hotfix-1.2.1”merging into$ git checkout masterSwitched to branch “master”$ git merge --no-ff hotfix-1.2.1Merge made by recursive.(Summary of changes)$ git tag -a 1.2.1$ git checkout developSwitched to branch “develop”$ git merge --no-ff release-1.2.1
    • 112. branching off$ git flow hotfix start 1.2.1Switched to a new branch “hotfix-1.2.1”merging into$ git flow hotfix finish 1.2.1Merge made by recursive.(Summary of changes)Deleted branch “hotfix-1.2.1” (was 071ab57).
    • 113. branching model
    • 114. github-flow a simpler git workflow
    • 115. •git-flow é mais do que precisam•deploy contínuo para produção (>1/dia)•a ideia de releases não importa•hotfixes ~= small features
    • 116. master “deploiável”
    • 117. branches descritivas ex: novo-widget-rota
    • 118. commit local a todo momento push regularmente
    • 119. pull request
    • 120. review merge deploy
    • 121. git-flowa successful branching model