Skip to content

This issue was moved to a discussion.

You can continue the conversation there. Go to discussion →

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

To everybody: main branch is force pushed. #7261

Closed
drmingdrmer opened this issue Aug 24, 2022 · 0 comments
Closed

To everybody: main branch is force pushed. #7261

drmingdrmer opened this issue Aug 24, 2022 · 0 comments

Comments

@drmingdrmer
Copy link
Member

drmingdrmer commented Aug 24, 2022

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).

New main:

commit 34a6160edd7d6f05472727ead6d0830bbfaf98b1 (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(34a6160). E.g.:

git fetch --all
git rebase 34a6160edd7d6f05472727ead6d0830bbfaf98b1 

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:

    git fetch --all
    git reset --hard 34a6160edd7d6f05472727ead6d0830bbfaf98b1
    git cherry-pick your-commit-1
    git cherry-pick your-commit-2
    ...
    
  • Otherwise, try rebuilding a squashed commit upon the new main:

    git fetch --all
    git update-ref refs/heads/my_branch $(echo "commit_message" | git commit-tree my_branch^{tree} -p 34a6160edd7d6f05472727ead6d0830bbfaf98b1)
    

    Replace my_branch and commit_message with your working branch and some great commit message.

Backup first!!!

@databendlabs databendlabs locked and limited conversation to collaborators Aug 24, 2022
@Xuanwo Xuanwo converted this issue into discussion #7263 Aug 24, 2022

This issue was moved to a discussion.

You can continue the conversation there. Go to discussion →

Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant