Skip to content

Commit 8acad04

Browse files
committed
CTR fix branches section of dev docs
1 parent 0c9e241 commit 8acad04

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

docs/src/dev/developer/for-committers.asciidoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ TinkerPop has several release branches:
142142
* `3.5-dev` - 3.5.x (no longer maintained)
143143
* `3.6-dev` - 3.6.x (no longer maintained)
144144
* `3.7-dev` - 3.7.x (non-breaking bug fixes and enhancements)
145-
* `master` - 4.x (current development)
145+
* `3.8-dev` - 3.8.x (current development)
146+
* `master` - 4.x (future development)
146147
147148
The branch description above that reads "non-breaking bug fixes and enhancements" simply means that within that release
148149
line (i.e. patch version) changes should not alter existing behavior, introduce new APIs, change serialization formats,
@@ -151,8 +152,8 @@ can be assured that their upgrades will not introduce potential problems. A good
151152
client of one version within a release line can interact properly with a server version within that same line. If so,
152153
it is likely an acceptable change within that branch.
153154
154-
Changes to earlier branches should merge forward toward `master` (e.g. `3.7-dev` should merge to `master`). Please read
155-
more about this process in the <<pull-requests, Pull Requests>> section.
155+
Changes to earlier branches should merge forward toward `master` (e.g. `3.7-dev` should merge to `3.8-dev` then
156+
`master`). Please read more about this process in the <<pull-requests, Pull Requests>> section.
156157
157158
As described in <<versioning,versioning>>, it is possible to do a "partial" release which will utilize a four-digit
158159
version that starts with a "1" (e.g. `3.6.0.1`). The branching strategy for a partial release requires that a `-dev`

0 commit comments

Comments
 (0)