To everybody: main branch is force pushed. #7263
drmingdrmer
announced in
Announcement
Replies: 2 comments
-
Or, we can close PR and start a new one (simple but works 🤣 ) |
Beta Was this translation helpful? Give feedback.
0 replies
-
Update: a second force push is made to clean up big objects in git history. |
Beta Was this translation helpful? Give feedback.
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
-
Update: the second time force push updated
main
to 42de73d. Snippets are updated with this new one.The original main contains several big files that have to be cleaned.
A recent history has been rewritten, and the old main branch is forcibly pushed, to clean up big objects introduced since 9a3e045 (
tests/suites/0_stateless/13_tpch/data/*
):Origin main:
commit d06cc14660c82ba9bf73e95d33373467ed58c1bf (tag: v0.8.6-nightly, before-clean)
.main
after the first force push:commit 7ee0e8dfccedccadeb8f002d23035030a3d6a14b bkp-main-08-24-18-00
.New main:
commit 42de73d733c05573815c8c8ada7c3c6fa9d43226 (main)
.Update your working branch
If your current work is based on the original main, you will have to rebase your branch onto the new
main
branch(42de73d). E.g.:Backup your branch first!
Troubleshooting
If the rebase mentioned above encounters a lot of conflicts, other choices are:
If your working branch contains just a few simple commits, use cherry-pick:
Otherwise, try rebuilding a squashed commit upon the new
main
:Replace
my_branch
andcommit_message
with your working branch and some great commit message.Backup first!!!
Beta Was this translation helpful? Give feedback.
All reactions