Branching, merging, and ensuring a clear main build

When do we run a build? Every time a commit is pushed. But every result is not the same. When dealing with a source control system such as Git, we typically have two kinds of branches:

  • One main branch
  • Feature branches

They implement a particular feature or bugfix, which will be merged into the main branch when ready, as is shown in the following figure:

In this example, we see how the main branch (master) is branched to develop feature A. Feature A is introduced briefly after that. There is a feature B that hasn't been merged yet since it's not ready. With the extra information on what ...

Get Hands-On Docker for Microservices with Python 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.