integrate(project): adopt Resource Admission ancestry - #1179
Closed
seonghobae wants to merge 151 commits into
Closed
integrate(project): adopt Resource Admission ancestry#1179seonghobae wants to merge 151 commits into
seonghobae wants to merge 151 commits into
Conversation
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Team Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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.
GitHub computed this temporary feature-branch integration edge as conflicting (
#970@a747cd6c164fce22ad41affaaef0e9f9da016a8e←#866@841e1c9b7329dba6d0ff16daecc009a2c3face0c). Closed unmerged as promised; no semantic delta, check, review, or approval is transferred through this PR. The conflict is a repair finding: #970 must adopt #866 through an explicit ordinary merge that reconciles the overlapping core crate root/Cargo path, Taurimain.rs, renderer analysis bridge/tests, and CHANGELOG while retaining each owner’s valid contracts.