diff options
| author | Zeyla Hellyer <[email protected]> | 2018-09-13 10:29:10 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2018-09-13 10:29:10 -0700 |
| commit | 069daef17ba7bc9241f4170f678e2a236cd51d7f (patch) | |
| tree | ee0831f90b3bb1d9c9cc475907ab00a798db28c4 /CONTRIBUTING.md | |
| parent | Revert "Old message on update (#368)" (diff) | |
| download | serenity-069daef17ba7bc9241f4170f678e2a236cd51d7f.tar.xz serenity-069daef17ba7bc9241f4170f678e2a236cd51d7f.zip | |
Change default branch to 'current'
The default branch of 'master' has a few issues, but the biggest technical issue
is that it doesn't accurately represent the development work done on it by name
alone: is it the branch for maintaining the "current" released version, or for
the development of the next majour version? In certain Rust projects these are
combined into one branch, but we don't do this, so this is one way out of the
ambiguity.
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1a0d8d2..ef553d5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,13 +6,13 @@ determined if the change is something that the community wants. There are going to (usually) be 3 primary branches: -- `master`: Development branch of the _most recent_ majour version. For example, +- `current`: Development branch of the _most recent_ majour version. For example, if the largest version is v0.5.3, then the v0.5.x series will be on this branch. Bugfixes, internal rewrites, documentation updates, new features, etc. go here so long as they do not introduce breaking changes. - `v0.Y.x`: Development branch of the _second most recent_ majour version. If the largest version is v0.5.X, then this will be the branch for bugfixes for the -v0.4.x version series. Bugfixes from the `master` branch may be backported here +v0.4.x version series. Bugfixes from the `current` branch may be backported here if applicable. - `v0.Z.x`: Development branch of the _next_ majour version. Following the same example, this would be for the v0.6.x version series. This is where breaking |