This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-website.git
The following commit(s) were added to refs/heads/trunk by this push:
new dddbfce3d Ensure 4.1 and 5.0 sections for git branch based
contributions state the correct versions
dddbfce3d is described below
commit dddbfce3dfc9c2b25216473627be9c0a2e1d93e2
Author: Caleb Rackliffe <calebrackli...@gmail.com>
AuthorDate: Fri Oct 20 14:37:13 2023 -0500
Ensure 4.1 and 5.0 sections for git branch based contributions state the
correct versions
---
site-content/source/modules/ROOT/pages/development/how_to_commit.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/site-content/source/modules/ROOT/pages/development/how_to_commit.adoc
b/site-content/source/modules/ROOT/pages/development/how_to_commit.adoc
index 383fcf605..e3c2ad1f4 100644
--- a/site-content/source/modules/ROOT/pages/development/how_to_commit.adoc
+++ b/site-content/source/modules/ROOT/pages/development/how_to_commit.adoc
@@ -63,7 +63,7 @@ On cassandra-4.0:::
compiles)
On cassandra-4.1:::
. `+git merge cassandra-4.0 -s ours --log+`
- . `+git format-patch -1 <sha-of-4.0-commit>+` (alternative to
+ . `+git format-patch -1 <sha-of-4.1-commit>+` (alternative to
format-patch and apply is [.title-ref]#cherry-pick -n#)
. `+git apply -3 <sha-of-4.1-commit>.patch+` (any issue with
CHANGES.txt : fix and [.title-ref]#git add CHANGES.txt#)
@@ -73,7 +73,7 @@ On cassandra-4.1:::
patch into the forward merge commit)
On cassandra-5.0:::
. `+git merge cassandra-4.1 -s ours --log+`
-. `+git format-patch -1 <sha-of-4.1-commit>+` (alternative to
+. `+git format-patch -1 <sha-of-5.0-commit>+` (alternative to
format-patch and apply is [.title-ref]#cherry-pick -n#)
. `+git apply -3 <sha-of-5.0-commit>.patch+` (any issue with
CHANGES.txt : fix and [.title-ref]#git add CHANGES.txt#)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
