Git With T for Team

Git is not just a version control system. Git can change the way you interact with your team members. Lot's of teams don't think about reflecting their development workflow in Git and just use it out-of-the-box. Git, however, can be much more powerful, giving your team a boost in productivity, protecting your delivery pipeline and helping you to work better together.
In this session we will start with a central workflow that is used by a lot of Subversion teams. You will learn how to practically integrate ALM solutions like continuous deployment, code reviews, change tracking and much more into your individual workflow. You will find out how to protect your master branch from accidental commits, broken builds and unreviewed code. This presentation will help you discover the best way to work together as a team - whether you're yet to migrate to Git or even an experienced Git user.

Transcript

1. GIT TEAM WITH T FOR @svenpet
2. SVN
3. GIT
4. MERCURIAL
5. CVS
6. ANYTHING ELSE TFS Perforce ClearCase VSS
7. NO VCS AT ALL? you must love pain
8. CHEAP BRANCHING EVERYTHING IS LOCAL GIT IS FAST GIT IS SMALL THE STAGING AREA DISTRIBUTED GITHUB & BITBUCKET GIT IS THE NEW STANDARD HUGE COMMUNITY GIT WHY IS GOOD*? * from Lemi Orhan Ergin
9. GIT WHY IS GOOD*? CHEAP BRANCHING EVERYTHING IS LOCAL GIT IS FAST GIT IS SMALL THE STAGING AREA DISTRIBUTED GITHUB & BITBUCKET GIT IS THE NEW STANDARD HUGE COMMUNITY WORKFLOW CAPABILITIES * from Lemi Orhan Ergin
10. MASTER RELEASE VERSION 1.9 DETAILED VIEW
11. BIRDS VIEW
12. DESIGNED FOR OPEN SOURCE
13. DISTRIBUTED WORKFLOW
14. CENTRALIZED WORKFLOW companies like those
15. @svenpet http://svenpet.com Sven Peters ATLASSIAN AMBASSADOR
16. RELEASE Can we fix a bug for the upcoming ? FEATURE Is the code for that complete? for the current version? HOTFIX Can we do a fast BUILD Can we the current code ? REVIEWED Has everybody the code for this feature ?
17. I FIND YOUR LACK OF WORKFLOW STRUCTURE DISTURBING
18. DIFFERENT PEOPLE PRODUCTS CULTURES
19. DIFFERENT PEOPLE PRODUCTS CULTURES JIRA, Bitbucket, Stash
20. DIFFERENT PEOPLE PRODUCTS CULTURES
21. DIFFERENT PEOPLE PRODUCTS CULTURES DIFFERENT WORKFLOWS
22. WORKFLOW BUILD YOUR rebase merge fork clone push pull
23. Git WORKFLOW BUILD YOUR
24. NOT POSSIBLE WITH GIT ONE WORKFLOW:
25. block files while working on it
26. we know what can happen!
27. FORK WORKFLOWS
28. MAKES A COPY OF A REPOSITORY ON THE SERVER YOU CAN NOT WRITE DIRECTLY TO THE ORIGINAL REMOTE REPOSITORY YOU CAN STILL GET CHANGES FROM THE ORIGINAL REMOTE REPOSITORY forking rocks!
29. THE GATEKEEPER WORKFLOW for teams
30. REPOSITORY it's such an awesome library
31. REPOSITORY FORKED REPOSITORY FORK
32. REPOSITORY FORKED REPOSITORY SYNCH Get updates on request or automatically* * with awesome tools like Stash or with Git hooks
33. REPOSITORY FORKED REPOSITORY FORK I've done an awesome change
34. REPOSITORY FORKED REPOSITORY PUSH CHANGE X
35. REPOSITORY FORKED REPOSITORY can you pull in my changes? he is the gatekeeper
36. REPOSITORY FORKED REPOSITORY PULL CHANGES likes the changes
37. exactly and it works great! LOOKS LIKE AN OPEN SOURCE PROCESS?
38. DISTRIBUTED TEAMS DIFFERENT PROGRAMMING SKILLS FLEXIBLE ROADMAPS LEARN FROM OPEN SOURCE TEAMS?
39. FORKING IN THE ENTERPRISE
40. FORKING IN THE ENTERPRISE 5 REASONS FOR...
41. FORKING IN THE ENTERPRISE REASON 1 GREAT FOR CUSTOMIZING LIBRARIES and still get bug fixes
42. FORKING IN THE ENTERPRISE REASON 2 GREAT FOR INNOVATION SPIKES and maybe add it later
43. FORKING IN THE ENTERPRISE REASON 3 PROTECTING YOUR COMPONENTS but still be open for changes
44. FORKING IN THE ENTERPRISE REASON 4 REDUCE THE NOISE and keep the overview for huge projects
45. FORKING IN THE ENTERPRISE REASON 5 INTERACTION WITH CONTRACTORS & INTERNS protect your sources
46. THE WORKFLOW DICTATORS & LIEUTENANTS
47. an army of developer
48. a few integrator
49. and a friendly dictator
50. BLESSED REPOSITORY FORKED REPOSITORY FORKED REPOSITORY SYNCH
51. BLESSED REPOSITORY FORKED REPOSITORY FORKED REPOSITORY Pull
52. BLESSED REPOSITORY FORKED REPOSITORY FORKED REPOSITORY Pull X too much stuff!
53. BLESSED REPOSITORY FORKED REPOSITORY FORKED REPOSITORY FORKED REPOSITORY FORKED REPOSITORY Pull Pull Pull
54. BLESSED REPOSITORY FORKED REPOSITORY FORKED REPOSITORY FORKED REPOSITORY FORKED REPOSITORY Pull Pull Pull We are here to help!
55. GREAT FOR HUGE PROJECTS
56. THIS IS A POTENTIAL BOTTLENECK
57. YOU NEED MORE FREEDOM? AND WANT TO MOVE FAST?
58. THE CENTRALIZED WORKFLOW
59. HELLO SUBVERSION USERS! THIS FLOW IS YOUR but Git makes it even better
60. master ONE BRANCH TO RULE THEM ALL all code goes in here
61. CENTRAL REPOSITORY CLONED REPOSITORY your (full) local copy for development
62. CENTRAL REPOSITORY CLONED REPOSITORY everybody integrate changes here your (full) local copy for development
63. CENTRAL REPOSITORY CLONED REPOSITORY do that often!
64. SIMPLE & EASY TO LEARN +CI = ALWAYS DEPLOYABLE CONFLICTS GET VISIBLE EARLY USED FOR YEARS
65. GREAT FOR MIGRATING don't change too much at once
66. UNFINISHED FEATURES
67. FEATURE TOGGLES
68. THE WORKFLOW FEATURE BRANCH
69. WE ORGANIZE WORK IN TASKS, STORIES, FEATURES WHY NOT HAVE THAT IN CODE, TOO?
70. master Feature 1 Feature 2 BRANCH PER FEATURE 1 to X devs working on a branch
71. master BRANCH PER FEATURE Feature 1 Feature 2 get closed when done
72. CLEAN MASTER BRANCH
73. ISOLATED FEATURE DEVELOPMENT
74. GREAT FOR FIXED TIME / FIXED FEATURE DEVELOPMENT develop while bugfix
75. GREAT FOR CONTINUOUS DELIVERY deliver when done
76. master merge frequently FEATURE BRANCH TIPS
77. master synch with MASTER frequently FEATURE BRANCH TIPS
78. master delete branch when done FEATURE BRANCH TIPS
79. master Feature 1 Feature 2 BRANCH PER FEATURE useful branch names
80. master ADD USER DELETE USER BRANCH PER FEATURE useful branch names
81. master J-60 ADD USER J-98 DELETE USER BRANCH PER FEATURE use key from issue tracker
82. THE WORKFLOW FEATURE BRANCH with code reviews
83. LEARN BETTER QUALITY FEEL BETTER BLAME WHY DO YOU WANT TO DISCUSS YOUR CODE CHANGES?
84. PULL REQUESTS + < >
85. master Pull Request what do you think?
86. master Pull Request discuss changes GOOD! AGREE!
87. master Pull Request approve changes
88. master Pull Request merge
89. THE WORKFLOW * *SOURCE: ZACH HOLMAN "HOW GITHUB WORKS"
90. THE WORKFLOW FEATURE BRANCH with history
91. DON'T FORGET YOUR PAST
92. master HISTORY DEVELOP new branch called DEVELOP
93. master HISTORY DEVELOP we integrate changes here Feature
94. master HISTORY DEVELOP and tag our releases here Feature V. 1.1
95. master HISTORY DEVELOP makes this branch stable Feature V. 1.1
96. THE WORKFLOW
97. Production STAGING upcoming version THE WORKFLOW never direct integration... just for hotfixes only through Pull Request (except when not)
98. Production STAGING without Pull Request THE WORKFLOW we create a HOTFIX branch (of course) and also merge to STAGING-Branch
99. THE WORKFLOW RELEASE
100. COOL STUFF WE'RE FLOWING!
101. RELEASE CANDIDATES inspect your release candidate
102. inspect your release candidate ...and don't destroy your flow RELEASE CANDIDATES
103. master RELEASE DEVELOP RELEASE CANDIDATE feature complete release team works here other dev teams "flow" here
104. master RELEASE DEVELOP RELEASE CANDIDATE fixing back to DEVELOP
105. master RELEASE DEVELOP RELEASE CANDIDATE merge, tag, release! V. 1.1
106. POTENTIALLY READY PROMISED SET OF FEATURES BUGS HAVE A BIG IMPACT RELEASES ARE EXPENSIVE AFRAID OF FAILURES
107. THE WORKFLOW MAINTENANCE
108. RELEASED SOFTWARE HAS BUGS Houston we have a problem
109. master MAINTENANCE DEVELOP 1.1 hotfix branch from MASTER and fix the damn bug
110. master MAINTENANCE DEVELOP 1.1 hotfix merge with MASTER, tag and release 1.2.1
111. master MAINTENANCE DEVELOP 1.1 hotfix merge with DEVELOP and delete HOTFIX 1.2.1
112. master MAINTENANCE DEVELOP 1.1 hotfix RC - 1.2 1.1.2 ONE EXCEPTION: A RELEASE BRANCH EXISTS
113. THE FLOW GIT
114. YOU'VE JUST SEEN IT!
115. FLOW GIT THE DEVELOP & MASTER BRANCH FEATURE BRANCHES RELEASE BRANCHES MAINTENANCE BRANCHES from Vincent Driessen
116. HOW CAN I FIND MY WAY THROUGH THE RULE JUNGLE? USE TOOLS
117. HOW CAN I REMEMBER ALL THESE GIT COMMANDSAND RULES? there is a command line tool git flow release start 1.6 git flow feature start 'JRA-34 Add User' git flow feature finish 'JRA-34 Add User' git flow hotfix finish 1.5.3
118. HOW CAN I REMEMBER ALL THESE GIT COMMANDSAND RULES?
119. FLOW GIT WHY I thought every team is different?
120. FLOW GIT WHY IT CAPTURES A LOT OF DEVELOPMENT SITUATIONS IT'S WELL KNOWN: EASY ADOPTION BUT I WON'T USE IT OUT-OF-THE-BOX: ADAPT IT!
121. THE FLOW STASH TEAM at Atlassian
122. FLOW GIT MAKING MORE SIMPLE getting rid of MASTER
123. BRANCH KEEP YOUR RELEASE no merge into MASTER needed
124. RELEASE 2.1 STASH TEAM FLOW DEVELOP 2.1 no MASTER, we keep RELEASE
125. RELEASE 2.1 DEVELOP 2.1 hotfix 2.1.1 branch HOTFIX from RELEASE and fix the damn bug STASH TEAM FLOW
126. RELEASE 2.1 DEVELOP 2.1 hotfix 2.1.1 merge back to RELEASE 2.1.1 STASH TEAM FLOW
127. RELEASE 2.1 DEVELOP 2.1 hotfix 2.1.1 and apply changes to DEVELOP 2.1.1 STASH TEAM FLOW
128. SUPPORTING OLD VERSIONS they are still out there ...and have sometimes problems
129. RELEASE 2.1 DEVELOP we need to fix a bug in 2.0 RELEASE 2.0 STASH TEAM FLOW
130. RELEASE 2.1 DEVELOP hotfix 2.0.1 you've seen this before RELEASE 2.0 STASH TEAM FLOW
131. RELEASE 2.1 DEVELOP hotfix 2.0.1 merge with 2.1 RELEASE branch RELEASE 2.0 STASH TEAM FLOW
132. RELEASE 2.1 DEVELOP hotfix 2.0.1 and apply changes from RELEASE 2.1 to DEVELOP RELEASE 2.0 STASH TEAM FLOW
133. can change tomorrow STASH TEAM FLOW
134. We want to help STASH TEAM FLOW
135. RELEASE 2.1 DEVELOP 2.1 hotfix 2.1.1 2.1.1 I could do this
136. I could do this SERVER SIDE AUTO MERGES with Git hooks
137. LEAN BACK AND ENJOY PURE AWESOMENESS
138. RELEASE 2.1 DEVELOP hotfix 2.0.1 RELEASE 2.0 merge here STASH TEAM FLOW
139. RELEASE 2.1 DEVELOP hotfix 2.0.1 RELEASE 2.0 and let the robots take over STASH TEAM FLOW
140. NOT ENOUGH POSSIBILITIES?
141. INFINITE WORKFLOW POSSIBILITIES
142. CUSTOMIZE YOUR WORKFLOW WITH HOOKS
143. PUSH
144. PUSH Script is doing some stuff
145. PUSH
146. WATCH OUT: HOOK MAGIC at Atlassian
147. 1 DON'T BRANCH FROM A RED BUILD
148. 1 DON'T BRANCH FROM A RED BUILD
149. 2 BE INFORMED Chat
150. 2 BE INFORMED
151. WORKFLOWS WITH CI SERVERS Continuous Integration
152. WANT WE STABLE DEVELOP BRANCH THAT IS CI TESTED to be sure, that we won't break things
153. COULD WE PULL CHANGES BUILD LOCALLY MERGE IF OK
154. COULD WE MERGE & PRAY
155. MERGE AUTO ON WHY NOT USE BRANCHES ? FEATURE and build it from there!
156. DEVELOP potential integration problem AUTO MERGES
157. DEVELOP pull frequently AUTO MERGES
158. DEVELOP pull frequently automatically on commits AUTO MERGES
159. SOMETIMES WHEN MERGING SHIT HAPPENS. AND SOMEBODY PUSHES BUGGY CODE TO DEVELOP
160. DEVELOP push automatically on green builds of DEVELOP GREEN BUILD MERGES
161. POOR CI ADMINISTRATOR setting up builds for all these tasks
162. AUTO DETECT BRANCHES
163. AUTO DETECT BRANCHES
164. BUILD ON EVERY COMMIT KILLED OUR CI SERVERS x features branches * x pushes a day = server overload
165. BUILD ON EVERY COMMIT ON MASTER, RELEASE & DEVELOP BUILD MANUALLY ON FEATURE BRANCHES DOING AUTO MERGES ON GREEN BUILDS OF DEVELOP
166. WORKFLOWS WITH ISSUE TRACKING
167. DIFFERENT PEOPLE HAVE DIFFERENT VIEWS ON YOUR PROJECT cool developers incredible product owner amazing scrum master
168. ISSUE TRACKERS CONNECT US CODERS WITH THE REAL WORLD cool developers incredible product owner amazing scrum master
169. ISSUE TRACKERS CONNECTS GIT WITH THE REAL WORLD cool developers incredible product owner amazing scrum master
170. WE LIVE IN CODE! LET ME WORK IN CODE I JUST NEED TO KNOW WHAT MY CODE SHOULD SOLVE!
171. Problem understood, I start coding HOW DO ISSUE TRACKERS CONNECT TO THE CODE?
172. HOW DO ISSUE TRACKERS CONNECT TO THE CODE? Ah good, the coders started
173. commit -m "fixes #6, resolve ticket #5" HOW DO ISSUE TRACKERS CONNECT TO THE CODE?
174. HOW DO ISSUE TRACKERS CONNECT TO THE CODE? commit -m "fixes #6, resolve ticket #5"
175. WHAT'S IN IT FOR ? SEE WHAT'S IN DEVELOP SEE ISSUES IN REVIEW SEE FINISHED ISSUES ALREADY MERGED WITH DEVELOP non geeks
176. WHAT'S IN IT FOR ? DOING CODE REVIEWS IN CONTEXT BROWSING FEATURE DESCRIPTIONS SHOW CODE CHANGES
177. ... I HAVE A DREAM
178. 'START PROGRESS' ON AN ISSUE CREATES A FEATURE BRANCH DOING A PULL REQUEST MARKS THE ISSUE 'IN REVIEW' MERGING A FEATURE BRANCH MARKS THE ISSUE AS 'RESOLVED' GIT WORKFLOW
179. 'START PROGRESS' ON AN ISSUE CREATES A FEATURE BRANCH DOING A PULL REQUEST MARKS THE ISSUE 'IN REVIEW' MERGING A FEATURE BRANCH MARKS THE ISSUE AS 'RESOLVED' ISSUE WORKFLOW
180. 'START PROGRESS' ON AN ISSUE CREATES A FEATURE BRANCH DOING A PULL REQUEST MARKS THE ISSUE 'IN REVIEW' MERGING A FEATURE BRANCH MARKS THE ISSUE AS 'RESOLVED'
181. 'START PROGRESS' ON AN ISSUE CREATES A FEATURE BRANCH DOING A PULL REQUEST MARKS THE ISSUE 'IN REVIEW' MERGING A FEATURE BRANCH MARKS THE ISSUE AS 'RESOLVED' GIT COMBINED ISSUE WORKFLOW
182. RISE GIT TOOLS OF THE
183. DON'T FLOW LIKE IT'S 1999
184. svenpet.com/talks @svenpet DON'T USE GIT TOMORROW 3PM ROOM 7 THANKS
185. Resources RESOURCES GIT WORKFLOWS https://www.atlassian.com/git/workflows AUTO MERGES http://blogs.atlassian.com/2013/05/git-automatic-merges-with-server-side-hooks-for-the-win/ GIT RESOURCES https://www.atlassian.com/git/resources https://blogs.atlassian.com/2013/07/git-upstreams-forks/ FORKS & UPSTREAMS
186. PICTURES http://www.flickr.com/photos/80384851@N00/2653886484/ http://www.flickr.com/photos/21461615@N00/1353110751 http://www.flickr.com/photos/82402697@N00/449512594 http://www.flickr.com/photos/7228825@N05/675810372 http://www.flickr.com/photos/38451115@N04/4016842259/ http://www.flickr.com/photos/8749778@N06/5601758699/ http://www.flickr.com/photos/37831703@N00/3391877877 http://www.flickr.com/photos/60648084@N00/2900765643/ http://www.flickr.com/photos/28415633@N00/8401940159 http://www.flickr.com/photos/41304517@N00/6814372181 http://www.flickr.com/photos/99796131@N00/120468504/ http://www.flickr.com/photos/92269745@N00/4612732045/ http://www.flickr.com/photos/57768341@N00/3800568262/ http://www.flickr.com/photos/43322231@N07/4390305784/ http://www.flickr.com/photos/40011478@N00/2890078135/ http://www.flickr.com/photos/33909206@N04/7638306424 http://www.flickr.com/photos/8340753@N04/501465437/ http://www.flickr.com/photos/33774513@N08/3510825685/ http://www.flickr.com/photos/55723329@N00/3631928376/ http://www.flickr.com/photos/11389536@N03/5235804240/ http://www.flickr.com/photos/43322231@N07/5410534167 http://www.flickr.com/photos/43322231@N07/5366609719 http://www.flickr.com/photos/43322231@N07/4205372249/ http://www.flickr.com/photos/43322231@N07/4466599835/ http://www.flickr.com/photos/45940879@N04/5598027415/ http://www.flickr.com/photos/83346641@N00/3517813158/