Trunk-Based Development And Branch By Abstraction
Trunk-Based Development And Branch By Abstraction
About the Book
An all you need to know reference book about trunk-based development, Branch by abstraction and related software development practices. Many diagrams throughout, and a sections on working out how your company can get from where you are to trunk-based development, CI, CD and all that comes with it.
- 1 Preface
- 2.1 Brief Summary
- 2.2 Claims
- 2.3 Caveats
- 2.4 History
- 3.1 Trunk-Based Development prerequisites
- 3.2 Trunk-Based Development facilitates
- 3.3 Psychological safety
4 Five-minute overview
- 4.1 Distance between developers
- 4.2 What it is
- 4.3 A safety net
- 4.4 Developer team commitments
- 4.5 Drilling into “Distance”
5 Deciding Factors
- 5.1 Release cadence
- 5.2 Source-Control Technology Choice
- 5.3 Conway’s Law
- 5.4 Database migrations
- 5.5 Shared code
- 5.6 Which dev teams?
6 Source-Control System Features
- 6.1 Productivity
- 6.2 Governance
7 Source-Control System Choices
- 7.1 Git and Mercurial
- 7.2 Perforce
- 7.3 Subversion
- 7.4 Team Foundation Server - TFS
- 7.5 PlasticSCM
8 Feature flags
- 8.1 Granularity
- 8.2 Implementation
- 8.3 Continuous Integration Pipelines
- 8.4 Runtime Switchable
- 8.5 Build Flags
- 8.6 A/B testing and betas
- 8.7 Tech Debt - pitfall
- 8.8 Flags History
9 Branch by Abstraction - Introduction
- 9.1 Ideal steps
- 9.2 Contrived example
- 9.3 Real life software example
- 9.4 Secondary benefits
- 9.5 Not a panacea
- 9.6 More reading for this procedure
- 9.7 History
10 Branch for release
- 10.1 Who is committing where?
- 10.2 Late creation of release branches
- 10.3 Fix production bugs on Trunk
- 10.4 Patch releases
- 10.5 Release branch deletion
- 11 Release From Trunk
12 Styles of Trunk-Based Development
- 12.1 Committing Straight to the Trunk
- 12.2 Short-Lived Feature Branches
- 12.3 Coupled “Patch Review” System
- 12.4 The Importance of a Local build
- 12.5 Choosing a style
13 Continuous Integration (CI)
- 13.1 Continuous Integration - as defined
- 13.2 CI services: Bots verifying human actions
- 13.3 Advanced CI topics
- 13.4 Industry CI daemon confusion
- 13.5 Server/daemon implementations
- 14 Committing straight to the trunk
- 15 Alternatives to committing straight to the trunk
16 Short-Lived Feature Branches
- 16.1 Merge directionality
- 16.2 Two developers concurrently working on short-lived feature branches
- 16.3 Personal preferences
- 16.4 Breaking the principles
- 17 Alternatives to short-lived feature branches
18 Continuous Code Review
- 18.1 The high bar today
- 18.2 Pull Requests (PRs)
- 18.3 Open Source contributions via PRs
- 18.4 PRs from colleagues
- 18.5 Common Code Owners
- 18.6 Enterprise code review - in the past
- 18.7 Mondrian
19 Continuous Delivery (CD)
- 19.1 Continuous Deployment
20 Concurrent development of consecutive releases
- 20.1 Concurrent Development?
- 20.2 Oops?
- 20.3 Reorder Releases?
- 20.4 Un-merge?
- 20.5 Flags, abstractions, and pipelines
- 21 Application/service strangulation
22 Observed habits
- 22.1 No Code Freeze
- 22.2 Quick Reviews
- 22.3 Chasing HEAD
- 22.4 Running the build locally
- 22.5 Facilitating commits
- 22.6 Powering through broken builds
- 22.7 Shared Nothing
- 22.8 Common code ownership
- 22.9 Always Release Ready
- 22.10 Thin vertical slices
23 You’re doing it wrong
- 23.1 Merely naming a branch trunk.
- 23.2 Cherry-pick of bug fixes from release branches to the trunk
- 23.3 Merging rather than cherry-pick to/from a release branch
- 23.4 Duration of ‘short-lived’ feature branches
- 23.5 Numbers of developers on ‘short-lived’ feature branches
- 23.6 Every day not being the same for developers.
- 23.7 Keeping a single release branch
- 23.8 Merge from one release branch to another release branch
- 23.9 Merge everything back from a release branch at the end of the release branch
24 Alternative branching models
- 24.1 Modern claimed high-throughput branching models
- 24.2 Legacy branching models
- 24.3 More than one trunk
- 24.4 CI (dis)proof of your branching model
- 25.1 Third-party dependencies
- 25.2 In-house dependencies
- 25.3 Code Ownership
- 25.4 Directed graph build systems
- 25.5 Recursive build systems
- 25.6 The “diamond dependency problem”
- 25.7 Clash of ideologies
- 25.8 Deciding against a monorepo
26 Expanding Contracting Monorepos
- 26.1 Gcheckout.sh
- 26.2 Contrived example of use
- 26.3 Contrived example of use #2
- 26.4 Git’s Sparse checkouts
- 26.5 Perforce’s client-specs
- 26.6 PlasticSCM’s cloaked.conf
- 26.7 Subversion’s sparse-checkouts
27 Game Changers
- 27.1 Revision Control System - RCS (1982)
- 27.2 Concurrent Versions System - CVS (1990)
- 27.3 Microsoft Secrets book (1995)
- 27.4 NetScape’s Tinderbox (1997)
- 27.5 Perforce and ClearCase (1998)
- 27.6 Extreme Programming’s Continuous Integration (1999)
- 27.7 Continuous Integration paper on MartinFowler.com (2000)
- 27.8 ThoughtWorks’ Cruise Control (2001)
- 27.9 Apache’s Gump
- 27.10 Subversion’s “lightweight” branching (2000 through 2001)
- 27.11 Git’s “lightweight” branching (2005)
- 27.12 Google’s internal DevOps (2006 onwards)
- 27.13 Branch by Abstraction technique (2007)
- 27.14 GitHub’s entire initial platform (2008)
- 27.15 Continuous Delivery Book (2010)
- 27.16 Travis-CI’s GitHub integration and pass/fail badges (2011)
- 27.17 Microservices (2011 and 2012)
- 27.18 Case Study: A Practical Approach To Large-Scale Agile Development (2012)
- 27.19 TravisCI’s per-commit speculative mergeability analysis (2012)
- 27.20 PlasticSCM’s semantic merge (2013)
- 27.21 Google revealing their Monorepo Trunk (2016)
- 27.22 Microsoft’s Virtual File System for Git (2017)
- 28.1 Books promoting Trunk-Based Development
- 28.2 Reports promoting Trunk-Based Development
29 Challenge: Identifying bottlenecks
- 29.1 Value Stream Mapping
- 29.2 Current Reality Trees
30 Addressing common bottlenecks
- 30.1 Warning: Culture eats strategy for breakfast
- 30.2 Development “cycle time” consideration
- 30.3 Insufficient business analysis.
- 30.4 Testing generally
- 30.5 Builds not speedy enough
- 30.6 Insufficient Pipeline steps
- 30.7 Fast build example
- 30.8 Test Impact Analysis
31 Trunk Correlated Practices: Charting where you are against others
- 31.1 Key to understanding the chart
- 31.2 Goal: Dialing up release cadence
- 31.3 Branching model and Source Organization
- 31.4 Release preparation & Continuous Integration
- 31.5 Code sharing and third party dependencies
- 31.6 Flags, toggles, changes that take a while, and code review
- 31.7 All classes of environment
- 31.8 Quality Assurance / Testing
- 31.9 Shift left
- 31.10 Unit tests followed by integration tests
- 31.11 Test Impact Analysis
- 31.12 Service Virtualization
- 31.13 A little bit of shift right
- 31.14 Database changes and rollbacks
- 31.15 Developer Duties/Attitude/Retention
- 31.16 Talent Retention
- 31.17 Others
- 32 Contributions
- 33 Glossary
- 34 Abbreviations Used in this Publication
Appendix 1: Different ways of explaining Branch By Abstraction
- Explained using UML sequence diagrams
- Explained using construction metaphor
- Explained using a series of changes to a Java app
Appendix 2: Visualizing CI & CD
- Traditional CI without CD
- Continuous Delivery into a QA or UAT environment
- Continuous Deployment into Prod
- Branch for Release
The Leanpub 45-day 100% Happiness Guarantee
Within 45 days of purchase you can get a 100% refund on any Leanpub purchase, in two clicks.
See full terms
Free Updates. DRM Free.
If you buy a Leanpub book, you get free updates for as long as the author updates the book! Many authors use Leanpub to publish their books in-progress, while they are writing them. All readers get free updates, regardless of when they bought the book or how much they paid (including free).
Most Leanpub books are available in PDF (for computers), EPUB (for phones and tablets) and MOBI (for Kindle). The formats that a book includes are shown at the top right corner of this page.
Finally, Leanpub books don't have any DRM copy-protection nonsense, so you can easily read them on any supported device.
El Manual del ManagerKeyvan Akbary, Félix López, and Álvaro Salazar
¿Has deseado alguna vez el haber tenido una buena introducción al rol del Engineering Manager? En este libro aprenderás lo necesario para ejercer el rol de una manera efectiva: Expectativas y Responsabilidades del Rol, 1-1s, Ayudar a Crecer, Objetivos, Planes de Carrera, Cultura, Feedback, Contratación, Cultura de Producto y mucho más.
Functional Design and ArchitectureAlexander Granin
Software Design in Functional Programming, Design Patterns and Practices, Methodologies and Application Architectures. How to build real software in Haskell with less efforts and low risks. The first complete source of knowledge.
CCIE Service Provider Version 4 Written and Lab Exam Comprehensive GuideNicholas Russo
The service provider landscape has changed rapidly over the past several years. Networking vendors are continuing to propose new standards, techniques, and procedures for overcoming new challenges while concurrently reducing costs and delivering new services. Cisco has recently updated the CCIE Service Provider track to reflect these changes; this book represents the author's personal journey in achieving that certification.
CCIE SP v4.1 - WorkbookŁukasz Bromirski, Piotr Jablonski, and Nicholas Russo
Are you striving to prepare to and pass CCIE SP lab exam? Take the opportunity and get this workbook! With the attached initial cfg files you will prepare yourself for the CCIE SP exam as well as learn SP technologies applicable to all kinds of today modern networks! This workbook covers blueprint topics and provides challenging examples.
Ansible for KubernetesJeff Geerling
Ansible is a powerful infrastructure automation tool. Kubernetes is a powerful application deployment platform. Learn how to use these tools to automate massively-scalable, highly-available infrastructure.
Ansible for DevOpsJeff Geerling
Ansible is a simple, but powerful, server and configuration management tool. Learn to use Ansible effectively, whether you manage one server—or thousands.
Code Faster in DelphiAlister Christie
This book will make you a faster Delphi developer, it doesn't matter if you are just starting out, or have been using Delphi since version 1, you will find all sorts of tips, tricks and hacks to boost your productivity.
Practical FP in Scala: A hands-on approachGabriel Volpe
A practical book aimed for those familiar with functional programming in Scala who are yet not confident about architecting an application from scratch.
Together, we will develop a purely functional application using the best libraries in the Cats ecosystem, while learning about design patterns and best practices.
R Programming for Data ScienceRoger D. Peng
This book brings the fundamentals of R programming to you, using the same material developed as part of the industry-leading Johns Hopkins Data Science Specialization. The skills taught in this book will lay the foundation for you to begin your journey learning data science. Printed copies of this book are available through Lulu.
Cloud StrategyGregor Hohpe
“Strategy is the difference between making a wish and making it come true.” A successful migration to the cloud shouldn’t be driven by wishes, but guided by a sound strategy, frameworks, and decision models. This book tells you how—without becoming superficial nor getting lost in technology and product details.
11 BooksThe Quality Software Bundle is for managers, would-be managers, and any of us who find themselves being managed and confused. This comprehensive bundle covers the entire span of software development approaches, from hacking through waterfall, cascade, prototyping, Iterative enhancement, reusable code, off-the-shelf, to Agile teams. The bundle...
Growing Agile: The Complete Coach's Guide
7 BooksGrowing Agile: Coach's Guide Series This bundle provides a collection of training and workshop plans for a variety of agile topics. The series is aimed at agile coaches, trainers and ScrumMasters who often find themselves needing to help teams understand agile concepts. Each book in the series provides the plans, slides, handouts and activity...
11 BooksIn this bundle, you will find 10 different agile books. They are about different aspects of being agile. - finding a job - doing coding dojo's - Retrospectives - Personal kanban - a non-typical coaching book and even a book that gives you an insight in the lives of some agile people.
WTFlop 6M + HU - Beta Bundle
Fifty Quick Ideas
3 BooksGet all three books for the price of two! Fifty Quick Ideas books are full of practical, real-world techniques that you can use to improve teamwork, build better products and build them in a better way.
Growing Agile: Coach's Guide Series
4 BooksThis bundle provides a collection of training and workshop plans for a variety of agile topics. The series is aimed at agile coaches, trainers and ScrumMasters who often find themselves needing to help teams understand agile concepts. Each book in the series provides the plans, slides, handouts and activity instructions to run a number of...
Marionette.js A to Z
Complete Scala Bundle
3 BooksScala is a general-purpose programming language and it's getting extremely popular these days. Some say that learning Scala could be a challenging task. My experience, however, suggests that this is actually a myth that has very little to do with reality. With the right approach, learning Scala can be easy, fun and rewarding.The first book from...
Build A Better Backbone App
3 BooksThe best way to learn new development skills is through experience, but that takes time you don't have.Get the best of both worlds with this bundle: you'll learn how to produce modern web applications by learning from experienced developers like Derick Bailey and David Sulc. BackboneJS is one of the favorite tools on the web today, but it...