cdCon 2022

Code-submission processes can highly impact developer productivity, especially as engineering teams scale and codebase complexity grows. Often, teams that work on a monorepo struggle with keeping their main branch stable, especially as the number of engineers merging changes (and consequently, the number of code-submissions per day) grows. This happens because incompatibilities emerge when multiple changes are combined, causing builds to break frequently. Poly-repo setups present their own challenges: synchronizing merges when changes span multiple repositories, rolling back related changes across repos, and testing across multiple build/test pipelines can become coordination time-sinks for developers. This talk will feature a distillation of various merge strategies that help teams scale, and their associated developer-productivity trade offs.