Agile Australia 2014 - Git Workflows

Transcript

2. Real world Git workflows
3. TODO Show of hands ! Picture with hands/lighter/concert
4. Stefan Saasen Atlassian Stash Development Lead
5. Stefan Saasen Atlassian Stash Development Lead @stefansaasen
6. 15% 38% from 2011 to 2013 Source: RedMonk Git Survey 2013 You heard is on the rise
7. Cheap local branching Full local history Speed Staging area prominent in Open Source Huge community You heard has Superior Merging Much faster than svn Distributed cryptographic integrity
8. We’ll cover:
9. 1 Collaboration model We’ll cover:
10. 1 2 Collaboration model We’ll cover: Branching model
11. 1 Practices 2 3 Collaboration model We’ll cover: Branching model
12. Which collaboration model? 1
13. Slide Title
14. Fully decentralized Anarchy ANARCHY
15. Fully decentralized Anarchy I do my thing I do my thing, too ANARCHY here’s mine, who tells john? look ma, a goat!
16. Blessed repository with Gatekeeper Gatekeeper
17. Blessed repository with Gatekeeper He is cool Gatekeeper To have your work accepted, talk to him
18. and Lieutenants Dictator
19. and Lieutenants Dictator long live the King! Lieutenants guard the King Blessed repository
20. Shared common repository Centralised
21. Shared common repository we share “everything” Centralised
22. +
23. + Enterprise
24. + = Centralized Enterprise
26. Builds Metrics Issues Deployments
27. Builds Metrics Issues Deployments They know where the code needs to go!
28. Which branching model?
29. Which branching model? 2
31. upcoming Release ? Can we still fix a bug for the
32. upcoming Release ? Can we still fix a bug for the Feature Is the code for that complete?
33. upcoming Release ? Can we still fix a bug for the Feature Is the code for that complete? for the current version? Hotfix How do we do a
34. upcoming Release ? Can we still fix a bug for the Feature Is the code for that complete? for the current version? Hotfix How do we do a Reviewed Has everyone the code for this feature ?
35. Git workflow? What’s the best
36. Git workflow? What’s the best We don’t know!
37. different cultures Git workflow? What’s the best
38. + different products different cultures Git workflow? What’s the best
39. + different teams + different products different cultures Git workflow? What’s the best
40. + different teams + different products different cultures = different workflows Git workflow? What’s the best
41. Design Workflows your own
42. 1. Single branch workflow - aka trunk
43. Committing locally Master Local Repository
44. Committing locally Master Local Repository
45. Central repository has updates Central Repository Local Repository Master Master
46. Getting updates via rebase Central Repository Local Repository Master Master
47. Getting updates via rebase Central Repository Local Repository Master Master
48. 2. Feature branching workflow
49. Creating a branch master
50. master Feature #1 Creating a branch
51. Adding changes master Feature #1
52. Merge master Feature #1 m
53. Working on features in parallel master Feature #1 Feature #2 m
54. Working on features in parallel master Feature #1 Feature #2 m
55. Suboptimal way master Feature #1 Feature #2 m m avoid this if possible
56. master Feature #1 Feature #2 m m m avoid this if possible Suboptimal way
57. A better way using rebase master Feature #1 Feature #2 m
58. Working on features in parallel master Feature #1 Feature #2 m m m
59. Working on features in parallel master Feature #1 Feature #2 m m m
60. Working on features in parallel master Feature #1 Feature #2 m m m •Always with local branches
61. Working on features in parallel master Feature #1 Feature #2 m m m •Always with local branches •With shared branches: After review, before merging
62. Working on features in parallel master Feature #1 Feature #2 m m m •Always with local branches •With shared branches: After review, before merging •Mostly a non-issue for short lived branches when updates from master are not required
63. 3. Continuous delivery workflow
65. master is in production 1
66. master is in production 1 promoted from staging, can receive hot-fixes
67. master is in production 1 staging is the next version 2 promoted from staging, can receive hot-fixes
68. master is in production 1 staging is the next version new features off staging 2 3 promoted from staging, can receive hot-fixes
69. master is in production 1 staging is the next version new features off staging 2 3 with branch names like: username/ISSUE-KEY-summary promoted from staging, can receive hot-fixes
70. staging master 3. Continuous delivery workflow feature-1 m
71. staging master feature-2 3. Continuous delivery workflow m feature-1 m m
72. staging master feature-2 3. Continuous delivery workflow m feature-1 m m m
73. staging master feature-2 3. Continuous delivery workflow m feature-1 m m R H m
74. staging master feature-2 3. Continuous delivery workflow m feature-1 m m R H release to production = merge master In Production m
75. staging master feature-2 3. Continuous delivery workflow m feature-1 m m R H only merges release to production = merge master In Production m
76. 4. Product releases workflow
78. one branch per feature 1
79. one branch per feature 1 one branch per bugfix 2
80. one branch per feature 1 one branch per bugfix long running stable branches 2 3
81. one branch per feature 1 one branch per bugfix long running stable branches 2 3 master is alpha/RC status 4
82. it’s just a normal branching workflow… master feature-1 feature-2
83. with long running release branches master 2.2 2.1 bugfix feature-1 feature-2
84. Master 2.2 Bugfix Merge 2.1 Bugfix
85. Master 2.2 Merge into 2.1 2.1 Bugfix
86. Master 2.2 Merge into 2.2 2.1 Bugfix
87. Master 2.2 Merge into Master 2.1 Bugfix
88. Master 2.2 2.1 Bugfix Automatically merging release branches
89. Master 2.2 2.1 Bugfix Automatically merging release branches Automatic MERGES!
91. 2.2 2.1 Bugfix Automatically merging release branches 2.1.5-SNAPSHOT 2.1.4 We don’t want to merge the 2.1.x version!
93. git merge --strategy= resolve
94. git merge --strategy= recursive
95. git merge --strategy=
96. git merge --strategy= ours
97. 2.2 2.1 Bugfix Automatically merging release branches 2.1.5-SNAPSHOT 2.1.4 $> git checkout stable-2.2 $> git merge -s ours stable-2.1
98. 2.2 2.1 Bugfix Automatically merging release branches merge commit, content discarded $> git checkout stable-2.2 $> git merge -s ours stable-2.1
99. overall picture master 2.2 2.1 bugfix feature-1 feature-2
100. Deep breath, it’s really simple
101. The merge protocol The secret sauce
102. The merge protocol The secret sauce When a branch is: Change flows from 
 branch to baseline: Change flows from baseline to branch:
103. The merge protocol The secret sauce When a branch is: Change flows from 
 branch to baseline: Change flows from baseline to branch: More stable than its baseline
104. The merge protocol The secret sauce When a branch is: Change flows from 
 branch to baseline: Change flows from baseline to branch: More stable than its baseline Release branch
105. The merge protocol The secret sauce When a branch is: Change flows from 
 branch to baseline: Change flows from baseline to branch: More stable than its baseline Continually Release branch
106. The merge protocol The secret sauce When a branch is: Change flows from 
 branch to baseline: Change flows from baseline to branch: More stable than its baseline Continually Never Release branch
107. The merge protocol The secret sauce When a branch is: Change flows from 
 branch to baseline: Change flows from baseline to branch: More stable than its baseline Continually Never Less stable than its baseline Release branch
108. The merge protocol The secret sauce When a branch is: Change flows from 
 branch to baseline: Change flows from baseline to branch: More stable than its baseline Continually Never Less stable than its baseline Release branch Feature branches
109. The merge protocol The secret sauce When a branch is: Change flows from 
 branch to baseline: Change flows from baseline to branch: More stable than its baseline Continually Never Less stable than its baseline When code complete Release branch Feature branches
110. The merge protocol The secret sauce When a branch is: Change flows from 
 branch to baseline: Change flows from baseline to branch: More stable than its baseline Continually Never Less stable than its baseline When code complete Continually Release branch Feature branches
111. The merge protocol The secret sauce When a branch is: Change flows from 
 branch to baseline: Change flows from baseline to branch: More stable than its baseline Continually Never Less stable than its baseline When code complete Continually Release branch Feature branches Credit: Laura Wingerd - The Flow of change
112. The merge protocol The secret sauce Release Branch Master http:/ /bit.ly/branch-based-workflows
113. The merge protocol The secret sauce Release Branch Master Merge continually http:/ /bit.ly/branch-based-workflows
114. The merge protocol The secret sauce Release Branch Master Merge continually Never merge! http:/ /bit.ly/branch-based-workflows
115. The merge protocol The secret sauce Release Branch Master Merge continually Backport single changes using git cherry-pick Never merge! http:/ /bit.ly/branch-based-workflows
116. http:/ /bit.ly/branch-based-workflows The merge protocol The secret sauce
117. atlassian.com/git More on git workflows
118. Practices
119. Practices 4
120. What happens to CI with git?
121. experiment on your feature branch Running builds on feature branches
122. experiment on your feature branch Running builds on feature branches
123. experiment on your feature branch Running builds on feature branches
124. experiment on your feature branch Running builds on feature branches keep your master branch green
125. x developer
126. x developer times x push to remote
127. x developer times x push to remote = lots of builds (waiting)
128. Running builds on feature branches automatically manually feature/IRKD-30 master v 1.2
129. Code Reviews
130. Code Reviews Better Quality Learn Find errors
131. Pull Requests part of your daily workflow
132. Part of your daily work
133. Part of your daily work Pull Request Discuss
134. Part of your daily work Pull Request Discuss
135. In Conclusion: the recipe
136. ! ! ! Branching Model Adopt Git Practices ! ! ! ! ! ! ! ! Collaboration Model
137. ! ! ! Branching Model Adopt Git Practices ! ! ! ! ! ! ! ! Collaboration Model Centralized
138. ! ! ! Branching Model Adopt Git Practices ! ! ! ! ! Product workflow ! ! ! Collaboration Model Centralized
139. ! ! ! Branching Model Adopt Git Practices ! ! ! ! ! Product workflow Continuous delivery workflow ! ! ! Collaboration Model Centralized
140. ! ! ! Branching Model Adopt Git Practices ! ! ! ! ! Product workflow Continuous delivery workflow ! ! ! Collaboration Model Centralized Merge protocol
141. ! ! ! Branching Model Adopt Git Practices ! ! ! ! ! Product workflow Continuous delivery workflow Build automatically, but leave knobs! ! ! ! Collaboration Model Centralized Merge protocol
142. ! ! ! Branching Model Adopt Git Practices ! ! ! ! ! Product workflow Continuous delivery workflow Embrace PR Build automatically, but leave knobs! ! ! ! Collaboration Model Centralized Merge protocol
143. ! ! Thank you for your ! attention! ! ! ! ! @stefansaasen ! ! ssaasen@atlassian.com ! www.atlassian.com
144. http://www.flickr.com/photos/45143319@N00/3888895871/ http://www.flickr.com/photos/40145521@N00/460270581/ http://www.flickr.com/photos/41864721@N00/4647696349 http://www.flickr.com/photos48889052497@N01/12613483263/ http://www.flickr.com/photos/30928442@N08/4766664095/ http://www.flickr.com/photos/marfis75/3272079115/ Credits