Chapter 4. Mainline

Mainline

Photo by John Vachon. Library of Congress, Prints & Photographs Division, FSA-OWI Collection, Reproduction Number: LC-USF34-064602-D DLC.

On the main line. Bowdle, South Dakota, February 1942.

When you are developing a software application as part of a team effort, you often have to reconcile parallel development efforts. Your version control tool provides branching and merging facilities. You can use branches to isolate parallel efforts, but this can have a cost. This pattern shows you how to manage your codeline to minimize the integration effort that branching and merging require.

Note

How do you keep the number of currently active ...

Get Software Configuration Management Patterns: Effective Teamwork, Practical Integration 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.