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.

Sign up for GitHub

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

Jump to bottom

Revert "Don't export Dates.adjust" #53089

Merged
merged 1 commit into from
Jan 28, 2024
Merged

Revert "Don't export Dates.adjust" #53089

merged 1 commit into from
Jan 28, 2024

Conversation

DilumAluthge
Copy link
Member

Reverts #53027

#53027 broke the doctest job in CI.

@DilumAluthge DilumAluthge added merge me PR is reviewed. Merge when all tests are passing revert This reverts a previously merged PR. labels Jan 28, 2024
@DilumAluthge
Copy link
Member Author

This PR should be merged as soon as the doctest job is green on this PR.

The original PR (#53027) can be re-landed (with a fix for the CI issue) at any point.

@DilumAluthge
Copy link
Member Author

cc: @jariji @LilithHafner

@DilumAluthge
Copy link
Member Author

cc: @quinnj

@DilumAluthge
Copy link
Member Author

DilumAluthge commented Jan 28, 2024 •
edited
Loading

To give more details, as I wrote in Slack:

I think there was a "semantic conflict" (in Bors terminology) between #53027 and #52914.

This PR reverts #53027.

But I think it would be fine if we wanted to revert #52914 instead.

@DilumAluthge DilumAluthge added the semantic conflict "Semantic merge conflict", in Bors terminology. label Jan 28, 2024
@LilithHafner LilithHafner merged commit dcb196e into master Jan 28, 2024
8 of 10 checks passed
@LilithHafner LilithHafner deleted the revert-53027-patch-5 branch January 28, 2024 21:53
@LilithHafner LilithHafner removed the merge me PR is reviewed. Merge when all tests are passing label Jan 28, 2024
@LilithHafner LilithHafner mentioned this pull request Jan 28, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
revert This reverts a previously merged PR. semantic conflict "Semantic merge conflict", in Bors terminology.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DilumAluthge @LilithHafner