Resolve frontend conflicts#31
Closed
ccasin wants to merge 2 commits intomshinwell:5.2-runtime-wip-mainfrom
Closed
Conversation
ncik-roberts
approved these changes
Aug 15, 2024
ncik-roberts
left a comment
There was a problem hiding this comment.
Thanks for doing this. Sorry that it involved quashing drift that I introduced in two copies of the same changeset. I redid the diff resolution and checked my work against yours. It was almost exactly the same. I left a comment in the small handful of places that I felt my resolution might be better.
Owner
|
See oxcaml#2972 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
A few notes:
printer/printast_with_mappings.ml- it doesn't seem to have been merged (possibly only things underocaml/were merged, and this is just the one that fails due to parsetree changes?). I just manually diffed it with the tip of flambda-backend and integrated the needed changes.ocaml/parsing/parser_types.mlrequired changes in the dynlink dune file - I'm not sure why these weren't needed when it was the lrgrep PR was merged, but the dynlink dune file in this branch is pretty different from the one in flambda-backend.Request review from @ncik-roberts