Merge PR31 from mshinwell/flambda-backend (Resolve frontend conflicts)#2972
Merged
mshinwell merged 2 commits intooxcaml:merge-5.2from Aug 28, 2024
Merged
Merge PR31 from mshinwell/flambda-backend (Resolve frontend conflicts)#2972mshinwell merged 2 commits intooxcaml:merge-5.2from
mshinwell merged 2 commits intooxcaml:merge-5.2from
Conversation
This was referenced Aug 27, 2024
Merged
250436f to
88ea29f
Compare
lukemaurer
pushed a commit
to lukemaurer/flambda-backend
that referenced
this pull request
Oct 23, 2024
…rontend conflicts) (oxcaml#2972) * Resolve frontend conflicts (cherry picked from commit 53d0120) * review feedback (cherry picked from commit 2c60bdd) --------- Co-authored-by: Chris Casinghino <ccasinghino@janestreet.com>
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
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.
I will self approve, this PR was fully reviewed and the conflict resolution was minor.
This is based on #2971.