This document provides information about a conference session on Git and productive teams, including: 1. An agenda for the session that covers happier developers, productive teams, and a product called Stash. 2. Information about WiFi access and instructions to fill out a survey for prizes. 3. Details on pricing plans for Stash, ranging from free basic versions to paid plans for more users.

1. WiFi: username / password

2. Tim Pettersen
Developer Advocate
@kannonboy
Abhin Chhabra
A couple of Atlassians who get Git and dig the DAG
Bitbucket Developer
@abhin_chhabra

3. The State of Git
15 min
Happier Developers
40 min
Break
10 min
Productive Teams
40 min
A bit about Stash
10 mins

4. • Fill out survey, win awesome stuff
(check the email you registered with)
!
• Tweet stuff with #gettinggitright
!
• WiFi: username / password
!
• Bathroom?

5. Who knows
?

6. Facts
500 Developers

7. Facts
1000+ Nerds

8. Facts
working on 9 products

9. or in just 3 words
We Software

10. We SoftwareTeams

12. they know what’s going on!
really small team
Let’s
do it!
Great
idea! Productivity++

13. team is growing
Let’s
do it!
Great! Why?
Who will
do it?
Is it done?
Have you
talked to QA?
I have no time
for this!
Productivity?

14. Productivity??
we’re not alone
Is it
profitable?!
When is it
done?!

15. Devel ping S ftware
is a
S cial Challenge

16. happy developers &
productive teams Ship software
Tools
faster & smarter

17. Ship software
faster & smarter
happy developers &
productive teams

18. Git is on the rise
15%
38%
from 2011 to 2013
Source: RedMonk Git Survey 2013

19. Git will continue to grow!
63%
37%
December 2015
Git
CVS + SVN
Source: Atlassian Git Survey 2013

20. Git works for the enterprise!
60%
100+ developers
1,000+ employees
Source: Atlassian Git Survey 2013

21. Git works for the enterprise!
27%
69%
use the cloud
develop on-premise
Source: CollabNet Git Survey 2013

22. Git means fast releases
Git
SVN
CVS
mainly
daily - weekly
mainly monthly
Source: Atlassian Git Survey 2013

23. Better code with Git
+15% more
Code Reviews when using GIT
thank you Pull Requests!
Source: Atlassian Git Survey 2013

24. Migrating soon?
atlassian.com/git

25. is just a tool!

26. WiFi: bcenter

27. Happier Developer
with
Be a
Erik van Zijst!
Bitbucket Developer
Tim Pettersen!
Developer Advocate
with! and! September 2014!

28. Happier Developer
with
Be a
Abhin Chhabra !
Bitbucket Developer
Tim Pettersen!
Developer Advocate
with! and! September 2014!

30. Time machine without paradoxes?

31. Why does make you happy?
2 Freedom & Safety
Explore & Understand
1
3
Speed, Speed, Speed
4 Control and Assemble

32. 1
Fast is the new Black
Speed, speed, Speed

33. Except push & pull
Everything is local

34. Written in C by Linux
kernel and filesystem
developers

35. Read: fast :D

36. But what if my repo is big?
2 12,000 non-merge commits
446k lines of code added
1
3
Recent Linux kernel release (3.13)
has 15+ million LOC
4 1,339 contributors
source lwn.net

37. 2 Freedom & Safety

38. Feature
Branching

39. Feature Branching

40. Feature branches: local
git checkout -b new-branch
creates a branch and switches to it

41. Feature branches:
published (remote)
git push origin new-branch
pushes a local branch remotely

42. git stash is awesome
It’s a way to
temporarily save
your work on a stack

43. So if your boss comes
screaming at your desk

44. Safety

45. Losing work is very hard
very very

46. maybe your git server
crashed and the hd is
corrupted?… no problem

47. Redundancy, every
developer has a clone

48. Chain of unlosability

49. Recover a file
git checkout file-name

50. Recover a commit
git checkout sha-1
or
git checkout ref (branch/tag)

51. Print file as in branch
can be any ref
git show branch:path/to/file

52. find a deleted method
git log -S<string>
search through all history

53. When all is lost, use the
reflog

54. More on recovery!
http://bit.do/recovering

55. 3 Explore & Understand

56. Hard Questions to git log
--author who did what
--after,--before when?
= history superpowers
Ask
-S string in all diffs

57. Who deleted that?
git log -1 -- [path]
lists where a file was deleted
git log --diff-filter=D --summary
lists all deleted files

58. Where is that constant?
git grep <regexp>
compare the speed between this and
regular grep or ack…you’ll be blown
away

59. have I merged this?
git branch --no-merged
lists branches not merged
git branch --merged
lists branches already merged

60. 4 Control and Assemble

61. What is a merge?
Merge commit
master
merges keep the
context of the
feature’s commits
feature

62. merge is better in git
git knows the ancestry
1
2
The merge is local
3 powerful merge strategies

63. In most cases
merge becomes a
non-event

64. rebase: Rewrite history
with safety belts on

65. What is a rebase?
It’s a way to replay
commits, one by one,
on top of a branch
master
feature

66. What is a rebase?
master
preserving the order
feature
of commits

67. What is an
--interactive rebase?
It’s a way to replay
commits, one by one,
deciding interactively
what to do with each
reword
fixup
pick
squash
edit
exec

68. CUSTOMARY
WARNING!
rebase rewrites history!
Treat this power with great
care. Only rewrite history of
local branches or…

69. Why does make you happy?
2 Freedom & Safety
Explore & Understand
1
3
Speed, Speed, Speed
4 Control and Assemble

71. Happy Developerwith
A

72. WiFi: bcenter

74. Productive Teamwith
A

75. Why makes a team great!
Improving Code Quality
1
2
Efficient Workflows
3 Better Collaboration
4 Natural Fit

76. Efficient Workflows

77. Can we still fix a bug for the
upcoming Release ?
Feature Is the code for that
complete?
How do we Hotfix
do
for the current version?
Has everyoneReviewed
the code for this feature ?

78. We don’t know!
What’s the best
Git workflow?

79. different cultures
+ different products
+ different teams
= different workflows
What’s the best
Git workflow?

80. Design
Workflows your own

81. Issues Code

82. Issues Code
JIRA-123 JIRA-123
JIRA-456
JIRA-456

83. Can’t be released right now
Unfinished features in your trunk / master branch

84. Branch per issue First:
feature/JIRA-30
stable master branch
isolated feature work
master

85. Branch per issue First:
feature/JIRA-30-user-
branch type
issue key
description

86. Branch per issue First:
bugfix/JIRA-31-
branch type
issue key
description

87. Branch per issue First:
hotfix/JIRA-32-broke-
branch type
issue key
description

88. Typos happne!
Tool switching sucks

91. Is the branch green?
Branch name
pre-populated

92. Confounding build breakages
master

93. Confounding build breakages
bugfix/
master

94. SAAS Workflow
1 Atlassian MarketplaceWorkflow

95. Simplest Workflow
release from here
master
feature/JIRA-30
feature/JIRA-45

96. Simple Workflow
release from here
master
develop
feature/JIRA-30
feature/JIRA-45
integrate here

97. Installable software
2 Atlassian StashWorkflow

98. Multiple Product Versions
v 1.1
v 1.2
master
feature/JIRA-30

99. Multiple Product Versions
v 1.1
bugfix/JIRA-41
v 1.2
master

100. Multiple Product Versions
v 1.1
bugfix/JIRA-41
v 1.2
master

101. Multiple Product Versions
bugfix/JIRA-45
v 1.1
v 1.2
master

102. Multiple Product Versions
bugfix/JIRA-45
v 1.1
v 1.2
master

103. Multiple Product Versions
bugfix/JIRA-45
v 1.1
v 1.2
master
boring work

104. Automatic merges
https://bitbucket.org/durdn/automatic-merge-hook
with a Git hook

105. Automatic merges
with Stash

106. Nearly everything is possible with
Design your workflow

107. Improving
Code Quality

108. Photo: Yogi (Flickr)
RCeovdieew

109. Better
Code
Shared
Knowledge
Team
Ownership

110. Developer guilt
G =
1
R+1

111. Team
Ownership

112. Code Reviews

113. Pull Requests
!

114. Pull Requests

115. do it before merge
Pull Requests

116. Pull Request Creation

117. Pull Request Creation

118. Pull Request Creation

119. Discuss your changes
Discuss

120. Discuss your changes

121. Side by side diff the choice is yours

122. invited reviewers

123. invited reviewers
minimum X approvals
Go merge!

124. Pull Request Merge Checks

125. Who would be
the best to review
my code?

126. Auto Suggest Reviewers
Free Add On For

127. Auto Suggest Reviewers
suggestions
why?

128. Suggestions:
committed code to this
Pull Request
contributed files that
were modified

129. Better
Collaboration

130. Working with
contractors?

131. Circle of
Trust
Photo: Aljaz Zajc

132. Contractors
Interns
Strangers on the
internet
Other
product
teams
Core dev Support
team
Circle of
Trust

133. Collaboration with SVN
Core dev
team
emailing patches
repository tarballs
hell-ish conflicts
Everyone
else

134. Collaboration with forks
Core dev
team Changes
Everyone
else
automatically
synchronize
downstream
.. but must
be reviewed
before moving
upstream

135. Collaboration with branches
feature
Senior
developers
Junior
developers
maste

136. Permissions for Branches with

137. Permissions for Branches with

138. Contractors
Interns
Strangers on the
internet
Other
product
teams
Core dev Support
team

139. Know your priorities
Security DevSpeed

140. Natural
Fit
to your existing flow

141. Pull Requests
There is so much going on in our projects!
Sprints
Builds
Issues
Branches

142. & CI

143. manually triggered
Building branches
automatically triggered
always build master
maste

144. Less time configuring
more time to code

145. Every line of code starts with
aReal Life Problem

146. Every line of code starts with
anIssue

147. Visualize your development
Issue
good old days
IN PROGRESS
Status People Code

148. Visualize your development
2014 style
! !
Issue
!
Build
Sprint Branch Pull Request

149. Visualize your development
! ! !

150. Automatic Issue Transitions
master
feature/JIRA-30
OPEN IN PROGRESS IN REVIEW DONE

152. See what’s going on
Pages
Bots with Builds
Issues
Branches
Pull Requests
etc.

153. Why Git?
More time to code
Better collaboration
Dev productivity
The future
Economics
Deliver software faster
Less bugs
Happy customers

154. Why Git?
Ship software faster & smarter

155. So now you can answer
“Why Git?”

156. Let’s talk a little bit about
“Why ?”

157. Why ?
1. BEST enterprise Git workflow
2. Integrations & extensibility
3. Scalability
157

158. 158
The Best Git Workflow
master
feature/STASH-123
X reviewers approved?
Y builds passed?
All tasks complete?

159. 159
The Best Git Workflow
master
feature/STASH-123
• Pull request merge checks
• Repository hooks
• Branch permissions
• Flexibility & extensibility

160. 160
Powerful integrations

161. 161
Plugin APIs
• Full Java API
• Repository Hooks
• Merge Checks
• User Interface
• REST end-points
• Filetype renderers
• SSH commands
Stash Platform
Branch
Permissions REST APIs Git SCM
Source? You betcha!

162. RESTful APIs insert /rest/api/latest
162

163. RESTful APIs insert /rest/api/latest
163

164. 164
Scalability
Request prioritization

165. 165
Scalability
Request queuing

166. 166
Scalability
Response Caching

167. 167
Scalability
Clustering

168. All sorts of teams are on
&

170. Why ?
• BEST enterprise Git workflow
• Integrations & extensibility
• Scalability
170

171. Please fill out our survey
Get a “Stash” photo and
tweet #gettinggitright
to get a t-shirt
Fill out our survey to
win wireless headphones
(check your email)

172. Q & A
$10 for up to 10 devs
Free basic version
Free for 5 users Totally free