© The Author(s), under exclusive license to APress Media, LLC, part of Springer Nature 2021
M. McCormickThe Agile Codexhttps://doi.org/10.1007/978-1-4842-7280-0_2

2. Small, Independent Units of Work

Scope Matters
Michael McCormick1  
(1)
Boulder, CO, USA
 

Daily Standup Day 2: Merge conflicts!

Developer Terry: “I spent the day resolving merge conflicts.”

Developer Jan: “I had all my merge conflicts resolved until Terry checked in.”

Developer Fran: “I had all my merge conflicts resolved until Jan and Terry checked their stuff in.”

As a best practice, developers do their work by branching off of the main code line for each User Story they work on. On this branch, their changes are isolated from impacting the main branch. Once they have completed their work, ...

Get The Agile Codex: Re-inventing Agile Through the Science of Invention and Assembly now with the O’Reilly learning platform.

O’Reilly members experience books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.