- The document describes the git-flow branching model for managing software development projects with Git. - It involves using main branches like master (for production releases) and develop (for integration of features) as well as supporting branches for features, releases, and hotfixes. - Features are developed on feature branches off develop, releases are prepared on release branches off develop and merged to both develop and master, and hotfixes for production are done on hotfix branches off master and merged to both develop and master.

1. git-flow
a successful branching model

2. branching model

5. decentralized but
centralized

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. origin

19. origin

20. origin
subteam
fetches

21. origin
subteam
fetches

22. origin
subteam subteam
fetches fetches

23. origin
subteam subteam
fetches fetches

24. subteam fetches
origin
subteam subteam
fetches fetches

25. subteam fetches
origin
subteam subteam
fetches fetches

26. subteam fetches
origin
subteam subteam
fetches fetches

27. subteam fetches
origin
subteam subteam
fetches fetches

28. the main branches

29. production-ready state
develop master

30. production-ready state
develop master

31. production-ready state
develop master

32. production-ready state
develop master
versão inicial
de prod

33. production-ready state
develop master
versão inicial
de prod

34. production-ready state
develop master
versão inicial
de prod

35. production-ready state
develop master
versão inicial
de prod

36. production-ready state
develop master
versão inicial
de prod

37. production-ready state
develop master
versão inicial
de prod

38. production-ready state
develop master
versão inicial
de prod

39. production-ready state
develop master
versão inicial
de prod

40. production-ready state
develop master
versão inicial
de prod

41. production-ready state
develop master
versão inicial
de prod

42. production-ready state
develop master
versão inicial
de prod
próximo
release em
prod

43. production-ready state
develop master
versão inicial
de prod
próximo
release em
prod

44. production-ready state
develop master
versão inicial
de prod
próximo
release em
prod

45. production-ready state
develop master
versão inicial
de prod
próximo
release em
prod

46. production-ready state
develop master
versão inicial
de prod
próximo
release em
prod

47. production-ready state
develop master
versão inicial
de prod
próximo
release em
prod

48. production-ready state
develop master
versão inicial
de prod
próximo
release em
prod

49. production-ready state
develop master
versão inicial
de prod
próximo
release em
prod

50. production-ready state
develop 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
prod
próximo
release em
prod

52. production-ready state
develop master
versão inicial
de prod
próximo
release em
prod
próximo
release em
prod

53. production-ready state
develop master
versão inicial
de prod
próximo
release em
prod
WIP para próximo
próximo release em
release prod

54. supporting branches

55. • Feature branches
• Release branches
• Hotfix branches

56. feature branches

57. •branch off from: develop
•merge back into: develop
•branching name convention, except:
•master
•develop
•release-*
•hotfix-*

58. feature
develop
branches

59. feature
develop
branches

60. feature
develop
branches

61. feature
develop
branches

62. feature
develop
branches

63. feature
develop
branches
início desenv.
nova feature

64. feature
develop
branches
início desenv.
nova feature

65. feature
develop
branches
início desenv.
nova feature

66. feature
develop
branches
início desenv.
nova feature

67. feature
develop
branches
início desenv.
nova feature

68. feature
develop
branches
início desenv.
nova feature

69. feature
develop
branches
início desenv.
nova feature

70. feature
develop
branches
início desenv.
nova feature

71. feature
develop
branches
início desenv.
nova feature

72. feature
develop
branches
início desenv.
nova feature

73. feature
develop
branches
início 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

77. feature
develop
branches
início desenv.
nova feature
fim desenv.
nova feature

78. feature
develop
branches
início desenv.
nova feature
fim desenv.
nova feature
feature
integrada

79. branching off
$ git checkout -b myfeature develop
Switched to a new branch “myfeature”
merging into
$ git checkout develop
Switched to branch “develop”
$ git merge --no-ff myfeature
Updating ea1b82a..05e9557
(Summary of changes)
$ git branch -d myfeature
Deleted branch “myfeature” (was 05e9557).
$ git push origin develop

80. branching off
$ git flow feature start myfeature
Switched to a new branch “myfeature”
merging into
$ git flow feature finish myfeature
Switched to branch “develop”
Updating ea1b82a..05e9557
(Summary of changes)
Deleted branch “myfeature” (was 05e9557).

81. release branches

82. •branch off from: develop
•merge back into: develop and master
•branch name convention:
•release-*

83. branching off
$ git checkout -b release-1.2 develop
Switched to a new branch “release-1.2”
merging into
$ git checkout master
Switched to branch “master”
$ git merge --no-ff release-1.2
Merge made by recursive.
(Summary of changes)
$ git tag -a 1.2
$ git checkout develop
Switched to branch “develop”
$ git merge --no-ff release-1.2

84. branching off
$ git flow release start 1.2
Switched to a new branch “release-1.2”
merging into
$ git flow release finish 1.2
Merge made by recursive.
(Summary of changes)
Deleted branch “release-1.2” (was f105d3).

85. hotfix branches

86. •branch off from: master
•merge back into: develop and master
•branch name convention:
•hotfix-*

87. develop hotfixes master

88. develop hotfixes master

89. develop hotfixes master

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

102. develop hotfixes master
tag
1.2

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
bug em prod
corrigido

109. develop hotfixes master
tag
1.2
bug em prod
corrigido

110. develop hotfixes master
tag
1.2
tag
1.2.1
bug em prod
corrigido

111. develop hotfixes master
tag
1.2
tag
1.2.1
bug em prod
corrigido

112. develop hotfixes master
tag
1.2
tag
1.2.1
bug em prod
corrigido

113. branching off
$ git checkout -b hotfix-1.2.1 master
Switched to a new branch “hotfix-1.2.1”
merging into
$ git checkout master
Switched to branch “master”
$ git merge --no-ff hotfix-1.2.1
Merge made by recursive.
(Summary of changes)
$ git tag -a 1.2.1
$ git checkout develop
Switched to branch “develop”
$ git merge --no-ff release-1.2.1

114. branching off
$ git flow hotfix start 1.2.1
Switched to a new branch “hotfix-1.2.1”
merging into
$ git flow hotfix finish 1.2.1
Merge made by recursive.
(Summary of changes)
Deleted branch “hotfix-1.2.1” (was 071ab57).

115. branching model

120. github-flow
a simpler git workflow

121. •git-flow é mais do que precisam
•deploy contínuo para produção (>1/dia)
•a ideia de releases não importa
•hotfixes ~= small features

122. master “deploiável”

123. branches descritivas
ex: novo-widget-rota

124. commit local a todo momento
push regularmente

125. pull request

126. review merge deploy

127. git-flow
a successful branching model