At this point, you will probably choose at least a feature branch approach, where every single developer works on his branch. When the work is done, the feature branch is ready to be merged onto the master branch; you will probably have to merge back from the master before, because one of your other colleagues has merged a feature branch after you started your one, but after that you basically have finished.
The following picture represents the branches evolution within the repository:
Get Git Essentials - Second Edition 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.
Get Mark Richards’s Software Architecture Patterns ebook to better understand how to design components—and how they should interact.
Dive in for free with a 10-day trial of the O’Reilly learning platform—then explore all the other resources our members count on to build skills and solve problems every day.
Start your free trial Become a member now