Repository navigation
scylla-4.x: restore upstream 4.19.4 ancestry lost in #1291 #1328
Description
#1291 was merged into scylla-4.x without 4.19.4 becoming an ancestor, so it was squashed or rebased. Its changes are on scylla-4.x; its ancestry is not.
Repair it with a pull request that holds only an ancestry merge, merged with Create a merge commit (as #1281 did):
git fetch --no-tags https://github.com/apache/cassandra-java-driver refs/tags/4.19.4:refs/upstream/4.19.4
git switch -c restore-4.19.4 <scylladb-remote>/scylla-4.x
git merge -s ours refs/upstream/4.19.4 -m "chore: record upstream 4.19.4 ancestry"
Activity