This is an automated email from the ASF dual-hosted git repository. colegreer pushed a commit to branch 3.6-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/3.6-dev by this push: new b43c90962a CTR minor docs update b43c90962a is described below commit b43c90962a954ff607deb3d0057eaa911669f7e1 Author: Cole-Greer <cole.gr...@improving.com> AuthorDate: Tue Jun 11 09:56:22 2024 -0700 CTR minor docs update --- docs/src/dev/developer/for-committers.asciidoc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/src/dev/developer/for-committers.asciidoc b/docs/src/dev/developer/for-committers.asciidoc index 12d2e3ea31..2b60ddd74e 100644 --- a/docs/src/dev/developer/for-committers.asciidoc +++ b/docs/src/dev/developer/for-committers.asciidoc @@ -139,10 +139,10 @@ TinkerPop has several release branches: * `3.2-dev` - 3.2.x (no longer maintained) * `3.3-dev` - 3.3.x (no longer maintained) * `3.4-dev` - 3.4.x (no longer maintained) -* `3.5-dev` - 3.5.x (non-breaking bug fixes and enhancements) +* `3.5-dev` - 3.5.x (no longer maintained) * `3.6-dev` - 3.6.x (non-breaking bug fixes and enhancements) -* `master` - 3.7.x (current development) -* `4.0-dev` - 4.0.x (future development) +* `3.7-dev` - 3.7.x (non-breaking bug fixes and enhancements) +* `master` - 4.x (current development) The branch description above that reads "non-breaking bug fixes and enhancements" simply means that within that release line (i.e. patch version) changes should not alter existing behavior, introduce new APIs, change serialization formats, @@ -152,8 +152,7 @@ client of one version within a release line can interact properly with a server it is likely an acceptable change within that branch. Changes to earlier branches should merge forward toward `master` (e.g. `3.6-dev` should merge to `master`). Please read -more about this process in the <<pull-requests, Pull Requests>> section. Note that `4.0-dev` is rebased on `master` -and currently behaves as a fresh repository as all 3.x content was removed. +more about this process in the <<pull-requests, Pull Requests>> section. As described in <<versioning,versioning>>, it is possible to do a "partial" release which will utilize a four-digit version that starts with a "1" (e.g. `3.6.0.1`). The branching strategy for a partial release requires that a `-dev`