Skip to content

Commit

Permalink
Rename master branch to mian branch (etcd-io#391)
Browse files Browse the repository at this point in the history
As branch master has been renamed to main, update branch name in branch_management.md
  • Loading branch information
MakDon authored Jun 23, 2021
1 parent 6bb961f commit 13eddb6
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions content/en/docs/v3.5/branch_management.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ description: etcd branch management

## Guide

* New development occurs on the [master branch][master].
* Master branch should always have a green build!
* Backwards-compatible bug fixes should target the master branch and subsequently be ported to stable branches.
* Once the master branch is ready for release, it will be tagged and become the new stable branch.
* New development occurs on the [main branch][main].
* 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.

The etcd team has adopted a *rolling release model* and supports two stable versions of etcd.

### Master branch
### Main branch

The `master` branch is our development branch. All new features land here first.
The `main` branch is our development branch. All new features land here first.

To try new and experimental features, pull `master` and play with it. Note that `master` may not be stable because new features may introduce bugs.
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](./dev-internal/release#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.

Expand All @@ -27,5 +27,5 @@ All branches with 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](./dev-internal/release#release-management). We will keep fixing the backwards-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.

[master]: https://github.com/etcd-io/etcd/tree/master
[main]: https://github.com/etcd-io/etcd/tree/main

0 comments on commit 13eddb6

Please sign in to comment.