Trunk Based Development

Talk presented at Dev Talks, a weekly event for development team at Involves.

Transcript

1. Trunk Based Development David Tiago Conceição Involves Android Dev BR @davidtiagocon
2. Opinionated Branches & Processes Trunk Based Development Heads Up
3. SVN As origens
4. SVN
5. SVN
6. Centralized Version Control System Long lived branches No planning Merge hell Inconsistencies SVN
7. git
8. Distributed Version Control System Lightweight branches Branches A lot of branches git
9. Long lived branches Waiting Branch from Branch Absence of planning Branches
10. Branches
11. Branches
12. Branches https://twitter.com/HenryHoffman/status/694184106440200192
13. Branches
14. Branches trunk/master
15. Branches /feature/a
16. Branches /feature/a
17. Branches /feature/a
18. Branches /feature/b Cool refactor
19. Branches ??? /feature/c
20. Branches Latest Release
21. Branches /hotfix/1
22. Branches
23. Branches
24. A successful Git branching model
25. A successful Git branching model
26. The great epiphany https://www.youtube.com/watch?v=ZmRwralIW74
27. The great epiphany Photo by Hugo Rocha on Unsplash ==
28. The great epiphany Photo by Hugo Rocha on Unsplash
29. Trunk Based Development Master Based Development TBD TBD Roots
30. Trunk and only trunk No feature branches No Pull Requests No manual blockers TBD Roots
31. https://trunkbaseddevelopment.com TBD Roots
32. Tools and Techniques TBD Roots
33. Small tasks Pair/Mob programming TDD Tools and Techniques
34. Automation Continuous Integration Continuous Deploy Staged Releases Tools and Techniques
35. Modules Microservices Branch by abstraction Feature flags Tools and Techniques
36. Mono repo Tools and Techniques
37. 1. Small tasks 2. Pair/Mob programming 3. TDD 4. Automation 5. Continuous Integration 6. Continuous Deploy 7. Staged Releases 8. Modules 9. Microservices 10. Branch by abstraction 11. Feature flags 12. Mono repo 13. ... Tools and Techniques
38. Consequences TBD Roots
39. Organization and planning Controlled WIP Increased Throughput Consequences
40. Constant Feedback Autonomy Consequences
41. Minimal conflicts Refactor Scale Consequences
42. Evolving to TBD roots Short Lived Branches Really short Organization and Planning Real Life TBD
43. Support tools 1. Small tasks 2. Pair/Mob programming 3. TDD 4. Automation 5. Continuous Integration 6. Continuous Deploy 7. Staged Releases 8. Modules 9. Microservices 10. Branch by abstraction 11. Feature flags 12. Mono repo 13. ... Real Life TBD
44. Support tools 1. Small tasks 2. Pair/Mob programming 3. TDD 4. Automation 5. Continuous Integration 6. Continuous Deploy 7. Staged Releases 8. Modules 9. Microservices 10. Branch by abstraction 11. Feature flags 12. Mono repo 13. ... Real Life TBD
45. Many Questions Real Life TBD
46. Can I merge? How to split a task? How to merge fast(er) ? How to test? How to gather feedbacks? Many Questions
47. Ideal WIP? Overhead? Merge blockers? Many Questions
48. More automation? Does it scale? Many Questions
49. Consequences Real Life TBD
50. Organization and planning Controlled WIP Increased Throughput Constant Feedback Autonomy Minimal conflicts Refactor Scale Consequences
51. Samples Real Life TBD
52. New Sync Rebranding Update Android SDK Samples
53. App Updater Logstash Samples
54. Samples
55. Samples
56. Questions and Comments
57. How to know more? 1. Tech Talk: Linus Torvalds on git: https://www.youtube.com/watch?v=4XpnKHJAok8 2. A successful Git branching model: https://nvie.com/posts/a-successful-git-branching-model/ 3. A Branching Strategy Simpler than GitFlow: Three-Flow: https://www.nomachetejuggling.com/2017/04/09/a-different-branching-strategy/ 4. How Chromium Works: https://medium.com/@aboodman/in-march-2011-i-drafted-an-article-explaining-how-the-te am-responsible-for-google-chrome-ships-c479ba623a1b 5. Trunk Based Development: https://trunkbaseddevelopment.com/ 6. Game Changers: https://trunkbaseddevelopment.com/game-changers/ 7. GitFlow considered harmful: https://www.endoflineblog.com/gitflow-considered-harmful 8. Remote feature flags do not always come for free: https://proandroiddev.com/remote-feature-flags-do-not-always-come-for-free-a372f1768a7 0 9. BranchByAbstraction: https://martinfowler.com/bliki/BranchByAbstraction.html
58. slack.AndroidDevBR.org Android Dev BR
59. Thank you! David Tiago Conceição david.tiago@involves.com.br Android Dev BR @davidtiagoconceicao twitter.com/@davidtiagocon speakerdeck.com/davidtcdeveloper