When you get Git right, it can help you write cleaner code, roll out new features faster, and make your entire development team more efficient.

2. Who knows
?

3. Facts
500 Developers

4. 1000+ Nerds
Facts

5. working on 9 products
Facts

6. or in just 3 words
We Software

7. We SoftwareTeams

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

9. Productivity?
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!

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

11. Devel ping S ftware
is a
S cial Challenge

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

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

15. All sorts of teams
are on
&

16. All sort of
teams

17. Migrating soon?
http://atlassian.com/git/

18. is just a tool!

20. Happier Developer
with
Be a

22. Time machine without paradoxes?

23. Why does make you happy?
2 Freedom & Safety
Explore & Understand
1
3
Fast & Compact
4 Control and Assemble

24. But Why?
Or How?

25. A lot of the “Why” can
be explained at the
Conceptual model

26. Written in C by Linux kernel
and filesystem developers

27. 5 minutes dive into
internals

28. Git is fundamentally a content-addressable
filesystem with a VCS user interface written
on top of it
Pro Git Book, Section: Git Inter nals ”
“

29. cba0a..
commit
tree
blob
content
blob
content
blob
content
98ca9..
92ec2..
5b1d3..
911e7..
cba0a..
tree 92ec2..
blob 5b1d3..
blob 911e7..
blob
author
committer
README
LICENSE
test.rb
size
size
size
size
size
parent
data model
r34ti..

30. $> tree .git/objects
.git/objects
├── info
└── pack
2 directories

31. git add some-file.txt

32. $> tree .git/objects
.git/objects
├── e4
│ └── 3a6ac59164adadac854d591001bbb10086f37d
├── info
└── pack
3 directories, 1 file
zlib compressed
SHA1

33. git commit -m "First commit"

34. $> tree .git/objects
.git/objects
├── 13
│ └── 1e360ae1a0c08acd18182c6160af6a83e0d22f
├── 31
│ └── 995f2d03aa31ee97ee2e814c9f0b0ffd814316
├── e4
│ └── 3a6ac59164adadac854d591001bbb10086f37d
├── info
└── pack
5 directories, 3 files
Commit
Tree
Blob

35. cba0a..
commit
tree
blob
content
blob
content
blob
content
98ca9..
92ec2..
5b1d3..
911e7..
cba0a..
tree 92ec2..
blob 5b1d3..
blob 911e7..
blob
author
committer
README
LICENSE
test.rb
size
size
size
size
size
parent
data model
r34ti..

36. data model
commit
tree c4d..
author
message: 1st!
tree
blob 5b1d3..
blob 911e7..
blob
cba0a..
size
size
READM
LICENS
test.rb
parent
…
commit
tree c4d..
author
message: Update!
parent 8efc8..
tree
blob 5b1d3..
blob 911e7..
blob
cba0a..
size
size
READM
LICENS
test.rb
…
commit
tree c4d..
author
message: More!
parent bc5e7..
tree
blob 5b1d3..
blob 911e7..
blob
cba0a..
size
size
READM
LICENS
test.rb
…
…

37. echo "// Comment" >> some-file.txt

38. git add some-file.txt

39. $> tree .git/objects
.git/objects
├── 13
│ └── 1e360ae1a0c08acd18182c6160af6a83e0d22f
├── 31
│ └── 995f2d03aa31ee97ee2e814c9f0b0ffd814316
├── c1
│ └── 9e6823e34980033917b6427f3e245ce2102e6e
├── e4
│ └── 3a6ac59164adadac854d591001bbb10086f37d
6 directories, 4 files
Entirely new BLOB

40. wat?

41. git gc

42. $> tree .git/objects
.git/objects
├── info
│ └── packs
└── pack
├── pack-7475314b451a882d77b1535d215def8bad0f4306.idx
└── pack-7475314b451a882d77b1535d215def8bad0f4306.pack
2 directories, 3 files

43. Loose Objects Packfile
1. zlib compressed
2. Delta encoded

44. Fast and Compact

45. Everything is local
Except push & pull

46. Read: FAST

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

48. Control and Assemble

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

50. Anatomy of a merge
.git/objects/36/80d8c8fd182f97cb0e75045e2fed5c7b7613ed
tree f362c42032aff677c1a09c3f070454df5b411239
parent 49a906f5722ad446a131778cea52e3fda331b706
parent bd1174cd0f30fe9be9efdd41dcd56256340f230e
author Marcus Bertrand <mbertrand@atlassian.com> 1409002123 -0700
committer Marcus Bertrand <mbertrand@atlassian.com> 1409002123 -0700
Merge branch 'foo/mybranch'
commit

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

52. Let’s talk about merge strategies!
git has breadth of choice on
how to merge changes!
resolve recursive octopus
ours subtree yours?

53. What is a fast-forward merge?
It will just shift the HEAD tag
master
feature
master
feature

54. merge strategy: resolve
Three-way merge of the ancestors
feature
Common ancestor
master M
Merge commit

55. merge strategy: recursive
3-way merge but climbs the ancestry tree
recursively if there are multiple ancestors
M
M
master
feature
ancestor 1
ancestor 3
ancestor 2

56. merge strategy: ours
Records a merge but skips incoming changes
feature
master M
IGNORE!

57. use “ours” to promote
more recent branches

58. merge becomes a
non-event

59. rebase: Rewrite history
with safety belts on

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

61. When you use merge…
You pollute your feature branch with
non-meaningful merge commits
not really part
of feature…
feature
master
meaningful
merge

62. What is a rebase?
It can be used to keep a feature
branch up to date with master
feature
master

63. What is an
--interactive rebase?
Helps you clean up your private
branches before publishing them
reword
fixup
pick
squash
edit
exec

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

65. So what do I use?
merge or rebase?

66. Merge Commit Rebase (FF) Rebase (Squash)
No merge commits
Verbose history
Easy to read
Can be more difficult
to trace changes
Which should I use?
“Ugly” history
Full traceability
Hard to screw up
mostly
some

67. Read more on the topic!
bit.do/merge-or-rebase

68. Pro tips for the road

69. Everyone has their favorite, but!
Liquid prompt is awesome
http://bit.do/liquid-prompt

70. Get all the alias goodness on Bitbucket
http://bit.do/git-aliases

72. Why does make you happy?
2 Freedom & Safety
Explore & Understand
1
3
Fast & Compact
4 Control and Assemble

73. Happy Developerwith
A

74. Productive Teamwith
A

75. Why makes a team great!
2 Improving Code Quality
Protect Code
1
3
Efficient Workflows
4 Git & Your Toolchain

76. Efficient Workflows

77. Can we still fix a bug for the
upcoming Release ?
Is the code for that
Feature
complete?
How do we do Hotfix
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
your own
Workflows

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-avatars
branch type
issue key
description

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

87. Branch per issue First:
hotfix/JIRA-32-broke-ie8-again
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/JRA-1
master

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

95. SAAS Workflow
1 Atlassian Marketplace
Workflow

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

97. Simplest Workflow
release from here
master
develop
feature/JIRA-30
feature/JIRA-45
integrate here

98. Installable software
2 Atlassian Stash
Workflow

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

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

101. Multiple Product Versions
v 1.1
bugfix/JIRA-41
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

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

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

106. Automatic merges
with Stash

107. Nearly everything is possible with
Design your workflow

108. Improving
Code Quality

109. Photo: Yogi (Flickr)
RCeovdieew

110. Have you ever been sitting in a long review session?

111. Felt uncomfortable when your code was discussed?

112. Better
Code
Shared
Knowledge
Team
Ownership
Code Review

113. Developer guilt
G =
1
R+1

114. Code Reviews

115. Pull Requests


116. Pull Requests

117. Pull Requests
do it before merge

118. Pull Request Creation

119. Pull Request Creation

120. Pull Request Creation

121. Pull Request Creation
Discuss

122. Discuss your changes

123. Side by side diff the choice is yours

124. Merge

125. Merge wait!

126. Pull Request Merge Checks

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

128. Auto Suggest Reviewers
Free Add On For

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

130. Make
Code Reviews
part of your daily work
asynchronously
less painful

131. Protect Code
without slowing you down

132. Control access to your repositories

133. Permissions for Repositories


 
 



Users & Groups
Repositories

134. Permissions for Repositories


 
 



Projects
Users & Groups

135. Permissions for Repositories


 
 



Projects
Users & Groups

136. Permissions for Repositories


 
 



Projects
Users & Groups

137. Pure
Permissions for Repositories
Repository Manger
- visual interface
- role based
- file system access
- SSH
- HTTPS

138. Repository Manger
Less time configuring
and waiting
more time to code

139. People can change code - You control the input

140. Forks
The way to allow changes
& protect your code

141. Server side clone of the repository



142. Server side clone of the repository
 

143. Pull request to contribute changes



144. Protect your repo

145. No protection
The Git Dude

146. master <deploy on green build to production> branch
everyone can read & branch
master
feature/IRKD-30
Branch Permissions with

147. Branch Permissions with
master <deploy on green build to production> branch
master
feature/IRKD-30
only allowed by trusted devs

148. Branch Permissions with

149. Know your priorities
Security DevSpeed

150. Git and your
Toolchain

151. & CI

152. Running builds on feature branches
experiment on your feature branch

153. Running builds on feature branches
keep your master branch green
experiment on your feature branch

154. try to remember
You’ll forget to set up the build in your feature branch!

155. Auto detect branches

156. x developer
times
x push to remote
= lots of builds (waiting)

157. Running builds on feature branches
automatically
v 1.2
master
feature/IRKD-30 manually

158. branch pull merge

159. Report the status!

160. branch pull merge
IN PROGRESS IN REVIEW DONE

161. JUST LET ME CODE!

162. branch pull merge
IN PROGRESS IN REVIEW DONE

163. TO DO IN PROGRESS IN REVIEW DONE
Branch
Commit
Pull Request
Open… Pull Request
… Merged

165. What’s the status?
Issue Status Issue Tracker
Pull Request
Build Status
Git Manager
Build Server
Deploy Status Config Manager

167. Development Info

168. Development Info
Branch

169. Development Info
Branch
Commit
Build
Failed…

170. Development Info
Branch
Commit
Build
Failed… Successful
Pull request
Open…

171. Development Info
Branch
Commit
Build
Failed… Successful
Pull request
Open… Merged

172. Development Info
Branch
Commit
Build
Failed… Successful
Pull request
Open… Merged
Deploy

173. JUST LET ME CODE!

174. JUST LET ME CODE!

175. All Development Info
Real Time
Notification
History Discussions

177. See what’s going on
with

178. See what’s going on
Builds
with

179. Bots
See what’s going on
with

180. Pages
See what’s going on
with

181. Why Git?Everything is awesome

182. Why Git?Everything is awesome
Doesn’t convince everyone

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

184. Why Git?
Ship software faster & smarter