This document discusses various Git workflows and simulations of software development workflows using games and diagrams. It describes common Git workflows like centralized workflow, Git flow, pull requests, and trunk-based development. It also presents hypothetical scenarios to simulate how different development practices might affect outcomes, such as varying commit frequencies, number of developers, and probabilities of merge conflicts. The document advocates experimenting with simulations to better understand one's own organization's workflows and challenges people to provide feedback to improve the ideas.

1. @randomsort
Simulating Git Workflows
Make informed decisions

2. @randomsort
Johan Abildskov @RandomSort
● Trainer
● Continuous Delivery Consultant
● Git, Jenkins, Gradle, Artifactory ...

3. @randomsort
● Continuous Delivery
● We’ve migrated a lot of companies to a Git toolchain
● Try to help people become better at delivering software
● Also by teaching the next generation

4. @randomsort
What brought me here?

5. @randomsort
Music on Cuba

6. @randomsort

7. @randomsort

8. @randomsort
Continuous Delivery Consultant
I help (primarily embedded) software companies get
better at delivering software.
This includes teaching, consulting, tool development
and a whole lot of arguing.

9. @randomsort
● We can’t do this here
● NIH-syndrome
● Why should I learn Git? I’m just a software developer
The consultants challenges

10. @randomsort
● Seeing diverse environments
● Helping people get many “Oh” or “That’s clever”
● Providing people with the opportunity to shine
The consultants rewards

11. @randomsort

12. @randomsort
● Taught Git on two continents
● Open-sourced the Git katas
● I do consulting, so I spent a lot of time discussing Git
But I try..

13. @randomsort
So you are on Git..

14. @randomsort
● Git flow
● Github Flow
● Pull Requests?
● Automation?
● Simplified Git Workflow
● The Git Development Git flow?!?
Research online

15. @randomsort
The reality
SVN WAS
BETTER!

16. @randomsort
ClearCase is very different from Git
Git allows you to work in new ways, to not force you to work a specific way
Own it!
We’re used to working this way
This is our workflow. Now
make it run in Git!

17. @randomsort
Centralized workflow
● Commit to master
● Push to master
● Pros: Simple few commands
● Cons: Easy to interfere with other developers
● Hard to protect the integrity of the master branch
● “You broke my build!” Or even worse “Who broke my build?”

18. @randomsort
The Git Flow

19. @randomsort
Pull request

20. @randomsort
Git Phlow
Master
ready/iss53
Master

21. @randomsort
The Git Core Development Git Flow

22. @randomsort
Git Workflow Dichotomy

23. @randomsort
I like Numbers

24. @randomsort

25. @randomsortSource: https://www.atlassian.com/git/articles/10-years-of-git

26. @randomsort
DORA says trunk based development
https://puppet.com/resources/whitepaper/state-of-devops-report

27. @randomsort

28. @randomsort
Scientific Method(?)
● A
● B

29. @randomsort
Graph of stuff over time
VALUE
TIME

30. @randomsort
• Continuous Delivery
• DevOps
• Agile
• Scrum
The buzzwords that drive us

31. @randomsort
● 1 developer
● No commits
● No deliveries
● How does that look like
Scenario 0:

32. @randomsort

33. @randomsort

34. @randomsort
Overview of Game of Developer Life

35. @randomsort
Diagrams and stuff ...

36. @randomsort
This is Diagram
Game Over?
Game Start
Actors Act State updates

37. @randomsort
● Developers develop
● Game state is reported
● We evaluate if our game should end
Overview of a turn

38. @randomsort
● Developers
● Future could include robots
○ CI/CD server, etc.
● Strategies for:
○ Working
○ (Unintentionally) Introducing Bugs
○ Committing
○ Delivering
○ Fixing bugs
Actors

39. @randomsort
● Holds work/value
● Can have a push strategy
Repositories

40. @randomsort
This is not the real world, but ...

41. @randomsort
● 1 developer
● Commits value at some frequency
● Never delivers
Scenario 1

42. @randomsort

43. @randomsort
Building Inventory

44. @randomsort
● We have 1 developer
● The developer commits and delivers value at some frequency
● What effect has altering those frequencies
Scenario 3

45. @randomsort

46. @randomsort

47. @randomsort

48. @randomsort
● Having something in production is better than not having something in
production
So let’s look at the cumulative value

49. @randomsort

50. @randomsort
● We have N developers
● The cost of a merge conflict is x
● The probability of a merge conflict is somehow connected to the
amount of work being merge
● What happens if we vary these parameters
Scenario 4

51. @randomsort

52. @randomsort

53. @randomsort
Thank you @figaw

54. @randomsort
● It’s not about the workflow
● It’s how you work with the workflow
● The right workflow will not fix your broken culture
Conclusions

55. @randomsort
● Represent tasks?
● Represent automation?
● Context switching?
Future work

56. @randomsort
• https://github.com/randomsort/gameofdevlife
• Gather weights from your own organization and try stuff out
Do your own experiments

57. @randomsort
http://opinionatedgit.com
● Twitter/GitHub: RandomSort
● github.com/praqma-training/gitkatas
● github.com/randomsort/gameofdevlife
Please tell me why I’m wrong

58. @randomsort
● Slides and code will be available on Twitter #gitmerge
Questions?