Skip to content

Commit b0a7af1

Browse files
committed
update branching workflow
1 parent 456b8a8 commit b0a7af1

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

docs/the-branching-workflow.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# The Branching Workflow
22

3-
Only three branches are maintained at any one time; these are `master` the current, and the former Server release series. Any change to the documentation is made in a branch based off of `master` with only a view exceptions.
4-
Once the branch's PR is approved and merged, the PR is backported to the branch for the **current** Server release and the **former** release, but only if it applies to it.
3+
Only three branches are maintained for this repo at any one time; these are `master` which is referenced with `next` on the web, the current, and the former product release, but only for major and minor versions. Any change to the documentation is made in a branch based off of `master` with only a view exceptions.
54

6-
When a new ownCloud major or minor version is released, a new branch is created to track the changes for that release, and the branch for the previous release is no longer maintained.
7-
That said, changes for patches and bugfixes to _some_ earlier versions are backported.
8-
Also see the [Maintenance and Release Schedule](https://github.com/owncloud/core/wiki/Maintenance-and-Release-Schedule)
5+
Any documentation changes for a version is created in master and backported to the version it applies to. This keeps the content consistent.
6+
7+
When a new major or minor version is released, a new branch is created to track the changes for that release, and the branch for the previous release is technically no longer maintained. That said, changes for patches and bugfixes to _some_ earlier versions are backported if reasonable.

0 commit comments

Comments
 (0)