You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by co...@apache.org on 2025/09/30 17:22:38 UTC
(tinkerpop) branch master updated (b67511190d -> 0749f7de83)
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from b67511190d Merge branch '3.8-dev'
add 8acad0445d CTR fix branches section of dev docs
add 9597095223 Merge branch '3.7-dev' into 3.8-dev
new 0749f7de83 Merge branch '3.8-dev'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/src/dev/developer/for-committers.asciidoc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(tinkerpop) 01/01: Merge branch '3.8-dev'
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 0749f7de830a2f52c2e58786d291e1925436c27f
Merge: b67511190d 9597095223
Author: Cole-Greer <Co...@improving.com>
AuthorDate: Tue Sep 30 10:22:20 2025 -0700
Merge branch '3.8-dev'
docs/src/dev/developer/for-committers.asciidoc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --cc docs/src/dev/developer/for-committers.asciidoc
index f44092c2f2,f34b53e9ac..9fd9c82838
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@@ -151,12 -152,12 +152,12 @@@ can be assured that their upgrades wil
client of one version within a release line can interact properly with a server version within that same line. If so,
it is likely an acceptable change within that branch.
- Changes to earlier branches should merge forward toward `master` (e.g. `3.7-dev` should merge to `master`). Please read
- more about this process in the <<pull-requests, Pull Requests>> section.
+ Changes to earlier branches should merge forward toward `master` (e.g. `3.7-dev` should merge to `3.8-dev` then
+ `master`). Please read 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`
-branch be created with the three digit prefix.
+As described in <<versioning,versioning>>, it is possible to do a "partial" release which will utilize the third "patch" digit
+version that starts with a "1" (e.g. `4.0.1`). The branching strategy for a partial release requires that a `-dev`
+branch be created with the two digit prefix (e.g. 4.0-dev).
Other branches may be created for collaborating on features or for RFC's that other developers may want to inspect.
It is suggested that the JIRA issue ID be used as the prefix, since that triggers certain automation, and it provides a