Terminology - A Typical Branching and Merging Policy

A simple and useful branching policy. This is presented here just in order to give a framework of terminology for describing guidance measures for merging, not as a restriction on what is to be supported. Types of merge:

Assume a partial ordering among branches, such that any given branch has (0 or more) Feature Branches that are less stable than it, and Release Branches that are more stable than it, and it is considered the parent of each of those. A merge may be performed between a parent branch and one of its immediate Feature or Release branches, and nowhere else.

A merge to or from a Release Branch may be forbidden in one direction, according to local policy.

BranchingMergingTerminology (last edited 2011-10-06 17:05:11 by JulianFoad)