Enable rebase merge #2084
Closed
Enable rebase merge #2084
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
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 |
|
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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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