Skip to content
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

Enable rebase merge #2084

Closed
wants to merge 1 commit into from
Closed

Conversation

tustvold
Copy link
Contributor

@tustvold tustvold commented Jul 15, 2022

This will allow preserving PR commit history, which in certain situations (e.g. #2081) can be desirable.

The alternative would be to perform the rebase merge locally and push to master, but this feels less hacky

@alamb
Copy link
Contributor

alamb commented Jul 15, 2022

I recommend we enable this for the period of time needed to preserve the history from object_store and then we can disable it. I think the current system of squash merges in arrow-rs main works well

@tustvold tustvold marked this pull request as draft July 15, 2022 18:00
@tustvold
Copy link
Contributor Author

I'll try doing the merge locally first, and we can merge this if necessary. I think I can push master, but it somewhat opaque what the asf auto-sync is actually setting

@tustvold tustvold closed this Jul 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants