diff --git a/Documentation/contributor-guide/branch_management.md b/Documentation/contributor-guide/branch_management.md index fae8990bf..dd3420cb7 100644 --- a/Documentation/contributor-guide/branch_management.md +++ b/Documentation/contributor-guide/branch_management.md @@ -3,7 +3,7 @@ ## Guide * New development occurs on the [main branch][main]. -* Main branch should always have a green build! +* The main branch should always have a green build! * Backwards-compatible bug fixes should target the main branch and subsequently be ported to stable branches. * Once the main branch is ready for release, it will be tagged and become the new stable branch. @@ -15,13 +15,12 @@ The `main` branch is our development branch. All new features land here first. To try new and experimental features, pull `main` and play with it. Note that `main` may not be stable because new features may introduce bugs. -Before the release of the next stable version, feature PRs will be frozen. A [release manager](./release.md#release-management) will be assigned to major/minor version and will lead the etcd community in test, bug-fix and documentation of the release for one to two weeks. +Before the release of the next stable version, feature PRs will be frozen. A [release manager](./release.md#release-management) will be assigned to the major/minor version and will lead the etcd community in testing, bug-fix, and documentation of the release for one to two weeks. ### Stable branches -All branches with prefix `release-` are considered _stable_ branches. +All branches with the prefix `release-` are considered _stable_ branches. After every minor release ([semver.org](https://semver.org/)), we will have a new stable branch for that release, managed by a [patch release manager](./release.md#release-management). We will keep fixing the backward-compatible bugs for the latest two stable releases. A _patch_ release to each supported release branch, incorporating any bug fixes, will be once every two weeks, given any patches. [main]: https://github.com/etcd-io/etcd/tree/main -