2. Real
World
Workflow
s

3. Nicola Paolucci
Developer Advocate / Git Evang
I come out nice in
pictures, I know :-).
durd
n.co
m
@durd
n

4. You heard
has
Cheap local branching
Full local history
10x the speed of svn
Staging area
Huge community
Speed
Feature based workflow
prominent in Open Source
Distributed
cryptographic integrity

5. ground breaking paradigm
is ground breaking

6. Workflow building blocks

7. We’ll cover how to choose:
1
Collaboration model
2
Branching model
3
Common Practices
4
Continuous Integration

8. Easy, right?
1
Which collaboration model?

9. I do my thing
ANARCHY
I do my thing, too
here’s mine, who
tells john?
look ma, a goat!
Fully decentralized
Anarchy

10. He is cool
Gatekeeper
Blessed repository
with Gatekeeper
To have your
work accepted,

11. Dictator
and Lieutenants
long live the King!
Lieutenants guard
the King
Blessed repository

12. Centralised
Shared
common
repository
we share “everything”
luckily no goats here

13. More on Collaboration models
atlassian.com/git

14. +
Enterprise
=Centralized

15. Branch & Repo permissions
Centralized allows fine
grained ACLs

16. Integration with your
Issue tracking and CI

17. 2
Which branching model?

18. Two common Branching Models
1
Product Releases
2
Continuous Delivery

19. 2.1
for Product Releases

20. maste
Time
feature
bugfix
branches
branch
PRJ-123PRJ-123-bug-
1
One Central Repository
2
One Branch per Feature
3
One Branch per Bugfix

21. stable
branch
2.2
PRJ-345-bug-description
Time
bugfix
maste
Long running
4
Stable Branches
5
Pull Requests
Before merges
6
master is alpha / RC

22. 2.2
for Continuous Delivery

23. promoted from staging, can receive hotfixes
1
master is in production
2
staging is the next version
3
new features off staging
with branch names like: username/ISSUE-KEY-summary

24. turbo boost!
3
Common
Practices

25. What is a Pull Request?

26. Pull Request
Low friction
I have some
code here!
Hey I have some code I
want to merge here,
take a look?
collaboration
Can I merge
it here?

27. Single Repository
vs
Remote Forks

28. Pros of a Single Repo
All feature
branches
available
1
Complete visibility
2
No per Dev remotes required
3
KISS

29. Forks
Are Great too BTW

30. With Forks
Every one has
their remote
repository
Full remote copy,
each has one
Integrator, Gatekeeper,
Tech Lead, etc.

31. Read “Cross”
1
Manage trust and maturity
2
X department and 3rd parties
3
Dev to Dev interactions

32. 4
Continuous Integration

33. 1
What happens to CI with git?
2
An explosion of branches
3
Performance degradation of build sys

34. 1
Building everything is expensive
2
Automatically build stable and master
3
Manually trigger feature branch builds

35. 5
Less Friction with

36. Advantage:
Integrated hooks

37. Advantage:
Merge checks

38. Advantage:
Fork syncing

39. In Conclusion: the recipe

40. Conclusions
Collaboration
Model
Branching
Model
Adopt Git
Practices
Build
Product
workflow
Automation &
CI setup
Embrace PR
automatically,
but leave
knobs!
Centralized
Continuous
delivery
workflow
Single Repo
or Forks
Hooks, hooks
everywhere

41. More on
atlassian.com/git

42. Nicola Paolucci
THANK YOU FOR YOUR
ATTENTION
Should I change
the pic?
durd
n.co
m
@durd
n

43. Atlassian
Git Repository
Management for
Enterprise Teams
Free Git Code Hosting
for Small Teams
Free Git Desktop client
for Mac or Windows

44. Rate this Talk
Git Workflows a-la-carte
Text code below to 22333
or visit http://bit.ly/1eQ82V4
MEH = 1N
NO T BA D = 1P
P R ET T Y GO O D = 1Q
A WES O ME = 1R
To join this session, send text 136888 to