-
Notifications
You must be signed in to change notification settings - Fork 3
Branches
This page is part of the English programming language's Git Cheat Sheet.
This repository contains sample code for a possible future English programming environment. The repository contains three main branches, and various topic branches. The three main branches are:
-
Master. The master branch contains versions that have been extensively tested and/or demonstrated, and have up-to-date documentation. The documentation just needs to be correct. Documentation for the sake of documentation is not desirable.
-
Proposed. The proposed branch versions that, after suitable testing, demonstration, documentation, and/or bug fixes, will hopefully be promotable to the main branch.
-
Development. The development branch contains versions to which new features are being added. The goal is for all regression tests to pass when a feature is added to the development branch. Failing that, the list of failing regression tests should be very stable, and very short.
As explained in the Pro Git book's chapter 3.4, individual features (especially ones that do not yet pass all of the regression tests) can be added on topic branches. When the features are ready, they can be merged into the development branch. A development branch can be promoted to proposed. A proposed branch can be promoted to the master branch.