Trunk-based branching
Definitions SCM: Acronym for Source Code Management. A source code management system is a system which stores code of applications (and possibly their configurations, their infrastructure definitions, their security policies, etc.). Files are stored in repositories in an aggregated way (modifications are new copies of the original files and deletions preserve the content of original files) and in an auditable way (each change keeps the author, the date, the modified files, and their modified content). These systems can be classified as centralized, such as SVN, or distributed, like Git. Release Process: Process that defines how a component is released from its development stage (even before) to production. It defines the different stages, the stakeholders in each of these stages, and how stakeholders interact in order to deliver the solutions to a final live environment. Branch: In a SCM, a branch is an independent set of consecutive temporal ordered changes. Branches can be duplicated, merged, etc. Introduction In order to make all members of the development teams work in a standarized way, it’s necessary to have a common understanding of the release process and the development tools and processes. One of them is the branching strategy. ...