It looks like it happened due to my recent merge. We were discussing on Slack what could go wrong but we have no clues so far.
I've pushed cassandra-5.0 and trunk with the command (I've looked into the bash history): git push --atomic apache cassandra-5.0 trunk My 5.0 branch which I pushed has no such merge (I pushed this branch also to my personal fork: https://github.com/jacek-lewandowski/cassandra/commits/cassandra-5.0) I am really curious about what went wrong as I want to avoid that in the future - - -- --- ----- -------- ------------- Jacek Lewandowski niedz., 17 gru 2023 o 05:00 Dinesh Joshi <djo...@apache.org> napisał(a): > thanks for the heads up. Is there anything we could do to avoid bad merges > in the future? > > Dinesh > > On Dec 16, 2023, at 3:26 PM, Mick Semb Wever <m...@apache.org> wrote: > > > The cassandra-5.0 branch accidentally got 229 trunk merge commits brought > into it. > > This has been fixed now, but required a forced push. I've gone ahead and > done this quickly for the sake of avoiding most folk from seeing it. > > The fix was > > git switch cassandra-5.0 > git reset --hard 2fc2be5 > git push --force origin cassandra-5.0 > > > > >
