Presentation at Git Merge 2018 Common pitfalls that organisations fall into when using and experimenting with Git

1. Getting Git Right
Git Merge 2018
Andrey Devyatkin

3. Andrey Devyatkin
Independent consultant
Continuous Delivery specialist and
coach
Whatever-I-can-get-my-hands-on
automator
Father, runner and traveler

4. #WEHAVEAPLAN
How Git changed what we mean by Continuous Integration
Branching strategies - dos and don'ts
Structuring repositories - dos and don'ts
Git and Scaling Continuous Delivery

5. To put it into context
First encounter in 2008-2009
Moved to Stockholm in 2011 to help with
a massive migration to Git
Consulted many more other migrations
within Ericsson
Left Ericsson and went into consulting -
helped even more companies to adopt Git
Trained 300+ people to use Git

6. Continuous Integration by Martin Fowler
Processes
Maintain a Single Source
Repository
Everyone Commits To the
Mainline Every Day
Every Commit Should Build the
Mainline on an Integration
Machine
Build automation
Automate the Build
Keep the Build Fast
Make Your Build Self-Testing
Fix Broken Builds Immediately
Make it Easy for Anyone to Get
the Latest Executable
https://martinfowler.com/articles/continuousIntegration.html

11. tested

12. tested
tested
You have no idea

14. We needed a branching strategy

15. A successful Git branching model
http://nvie.com/posts/a-successful-git-branching-model/

16. Cactus branching model
https://barro.github.io/2016/02/a-succesful-git-branching-model-considered-
harmful/

17. Trunk based development
https://trunkbaseddevelopment.com

18. Structuring repositories
Submodules
Git LFS
Organisation as well as deliverable dictates the structure
Many repos vs mono repo

19. Continuous Delivery

20. or

21. What is the problem with scaling?

22. Little’s Law
The long-term average number of
customers in a stable system L
is equal to
the long-term average effective arrival
rate, λ,
multiplied by
the average time a customer spends in
the system, W;
or expressed algebraically: L = λW.

26. Multiple product lines

27. This how we used to scale CD pipelines before
Where are we heading next?

28. Thanks!
@andrey9kin
andrey9kin@a59.company
github.com/andrey9kin