Michał Górny posted on Tue, 25 Jul 2017 10:05:06 +0200 as excerpted: > ==Specification== > ===Branching model=== > The main branch of the Gentoo repository is the <kbd>master</kbd> > branch. All Gentoo developers push their work straight to the master > branch, provided that the commits meet the minimal quality standards. > The master branch is also used straight for continous user repository > deployment.
s/continous/continuous/ > Since multiple developers work on master concurrently, they may be > required to rebase multiple times before being able to push. Developers > are requested not to use workflows that could prevent others from > pushing, e.g. pushing single commits frequently instead of staging them > and using a single push. This is unclear as to which of the two behaviors is encouraged vs. discouraged. Maybe just add an an explicit "(encouraged)" and "(discouraged)" by each as appropriate? > Developers can use additional branches to facilitate review and testing > of long-term projects of larger scale. However, since git fetches all > branches by default, they should be used scarcely. For smaller projects, > local branches or repository forks are preferred. Nit-picking/quibble: "Can" vs. "may": While "can" is perfectly appropriate as used here in informal settings, "may" is more formal (with "can" reserved for whether it's technically possible, not at issue here or it wouldn't need mentioned, while "may" indicates it's approved/recommended, there's a child's game, "Mother may I", that I recall reinforcing this when I was young). Since this is intended as a GLEP it's arguably quite formal and "may" /may/ be more appropriate, thus my mention of the issue altho either should be well understood and "can" would be entirely appropriate if the context isn't considered quite that formal. Entirely a judgment call. > Unless stated otherwise, the rules set by this specification apply to > the master branch only. The development branches can use relaxed rules. Can/may... There may be other uses I won't mention but if you decide it's worth changing at all, a search and evaluate usage may be worth it. > Rewriting history (i.e. force pushes) of the master branch is forbidden. -- Duncan - List replies preferred. No HTML msgs. "Every nonfree program has a lord, a master -- and if you use the program, he is your master." Richard Stallman
