Merge 5.2.0minus-17 #178
Merged
Merge 5.2.0minus-17 #178
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
Compiler Merge ChecklistThis PR seems to merge changes from Flambda. Please be sure to follow the below steps:
If this PR is not merging changes from Flambda, feel free to ignore this comment |
glittershark
approved these changes
Aug 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 merge wasn't complicated, but because of how I performed the merge, it might be a bit annoying to review (sorry). I merged multiple times at various points in history rather than performing one merge. As a result, meaningful commits are interlaced with commits that don't need review.
The following is the list of commits that can be skipped. These all have titles like "Import ocaml sources", "Automatic merges", or "Commit merge conflicts":
The following commits can maybe be skipped. They're commits that contain what I decided to be "trivial merge conflict resolution" while doing the merge. Disclaimer about this: there were a couple places where my "trivial" conflict resolution was wrong. The type-checker caught these, but maybe this means the trivial-ness of them isn't enough that they shouldn't be reviewed:
The rest of the commits are all ones that are probably worth reviewing.