How do you choose a git workflow that increases productivity and reduces the friction of your team? What are the battle tested practices of successful teams that moved to git? How is git used inside Atlassian? As you might have heard git has many compelling features and has gained incredible momentum in the industry at large. Yet understanding how an enterprise team can adopt it can be daunting. The presentation aims to help answer these questions and more: - Available collaboration models when using a distributed version control system like git - Branching models that foster and enhance parallel development - Emerging code best practices and choices that can be safely adopted when migrating to git - How Continuous Integration changes when your team embraces git

2. Ready! Workflows

3. Question time
at the end
Submit your
questions

4. Nicola Paolucci
Developer Advocate / Git Evangelist
@durdndurdn.comI come out nice in pictures, I know :-).

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

6. ground breaking paradigm
is ground breaking

7. Workflow building blocks

8. 1
Common Practices
2
3
Collaboration model
We’ll cover how to choose:
Branching model
Continuous Integration4

9. Which collaboration model?1
Easy, right?

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

11. Blessed repository with
Gatekeeper
He is cool
Gatekeeper
To have your work
accepted, talk to him

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

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

14. atlassian.com/git
More on Collaboration models

15. + = Centralized
Enterprise

16. Centralized allows fine
grained ACLs
Branch & Repo permissions

17. Integration with your
Issue tracking and CI

18. Which branching model?2

19. Product Releases1
Continuous Delivery2
Two common Branching Models

20. for Product Releases2.1

21. One Central Repository1
One Branch per Feature
One Branch per Bugfix
2
3
Time
master
feature
branches
PRJ-123-description

22. One Central Repository1
One Branch per Feature
One Branch per Bugfix
2
3
Time
master
bugfix
branch
PRJ-123-bug-description

23. Stable Branches4
master is alpha / RC5
Pull Requests6
Before merges
Long running
Time
master
stable
branch
PRJ-345-bug-description
bugfix
2.2

24. 2.2 for Continuous Delivery

25. master is in production1
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

26. Common Practices3
turbo boost!

27. What is a Pull Request?

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

29. Single Repository
vs
Remote Forks

30. Complete visibility1
No per Dev remotes required
KISS
2
3
Pros of a Single Repo
All feature
branches
available

31. Forks
Are Great too BTW

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

33. Manage codebase maturity1
X department and 3rd parties
Dev to Dev interactions
2
3
Read “Cross”

34. Continuous Integration4

35. What happens to CI with git?1
An explosion of branches2
3 Performance degradation of build sys

36. Building everything is expensive1
Automatically build stable and master2
3 Manually trigger feature branch builds

37. Less Friction and Automation5

38. Code Quality
via pre-commit hooks

39. Branch from green builds

40. Automatic merges for the win!

41. Time
master
stable
branch
PRJ-345-bug-description
bugfix
2.2
stable
branch
2.1
Automatic MERGES!

42. Ripple merges1
Server side update hook2
3 Or tool support

43. Read more at:
bitly.com/automatic-merges

44. In Conclusion: the recipe

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

46. Nicola Paolucci
THANKS YOU FOR YOUR ATTENTION
@durdndurdn.comShould I change the pic?

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