Merge 5.2.0minus-29
#212
Merged
Merge 5.2.0minus-29
#212
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 |
liam923
changed the title
5.2.0minus-295.2.0minus-29
Contributor
Author
dkalinichenko-js
approved these changes
Jan 29, 2026
Lucccyo
pushed a commit
to Lucccyo/oxmerlin
that referenced
this pull request
Feb 10, 2026
* Import ocaml sources for oxcaml/oxcaml@977afdd4ebd * Automatic merges * Commit conflicts * Resolve trivial conflicts * Resolve trivial type errors * Fix remaining errors * Bump magic numbers * Promote tests and fix some issues * Bump bootstrap compiler for flambda on github * Fix formatting * Import ocaml sources for oxcaml/oxcaml@0a1dc8de0264 * Automatic merges * Fixup jkind printing * Add flags * Import ocaml sources for oxcaml/oxcaml@4ac226a124a5 * Commit conflicts * Resolve conflicts * Update version name * Promote tests
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 PR merges oxcaml changes from
5.2.0minus-265.2.0minus-275.2.0minus-285.2.0minus-29into Merlin. The first 5 commits (up through 7f6db6c) are the result of running the import script and resolving trivial issues and thus should be skipped. Commits 2ddd27f and 5bf5842 should also be skipped, as they were the result of running the import script a second time to deal with a re-tag.