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
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 wrote:
>
>
> The cassandra-5.0 branch accidentally got 229 trunk merge commits brought
> into it.
>
> This has been fixed now, but required a force
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
