Saturday, November 30, 2019

Git Branching


Red dots denote commits. The model can be tuned based on the size of the team. For example, a single developer might just use one dev branch from master and work on it and keep merging back in the master. However, it's suggested to still cut release branches.

Larger teams would want to use a more elaborate mechanism of tagging and cutting release branches. Versioning of build can be done as per the blog.

The basic theme that should always be followed is to integrate the code as much as possible to the parent branches and maintain the stability of every code base across all branches. Pull early, push early and run integrations as much as needed. Have integration environments where any commit can trigger integration tests.

No comments:

Post a Comment