Skip to content

Commit

Permalink
Ensure 4.1 and 5.0 sections for git branch based contributions state …
Browse files Browse the repository at this point in the history
…the correct versions
  • Loading branch information
maedhroz authored and michaelsembwever committed Oct 20, 2023
1 parent 1d0135e commit dddbfce
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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#)
Expand All @@ -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#)
Expand Down

0 comments on commit dddbfce

Please sign in to comment.