fix(gc): resolve committed conflict markers in gc_runtime_root_holders.json from #11815 - #11848
Merged
Merged
Conversation
|
Navigate logical layers of code changes, visualize relationships, and explore their blast radius. Note Currently processing new changes in this PR. This may take a few minutes, please wait... ⚙️ Run configuration
📒 Files selected for processing (3)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
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 |
…s.json from #11815 Keeps main's PASS1_MARKED audit, appends the prototype-in-shape re-audit and pins gc/mod.rs at its current hash.
proggeramlug
force-pushed
the
fix-conflict-markers-11843-11815
branch
from
October 3, 2026 22:36
2a1ce4b to
63ff563
Compare
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
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.
#11815 landed gc_runtime_root_holders.json with conflict markers. This keeps main's PASS1_MARKED audit, appends the prototype-in-shape re-audit and pins gc/mod.rs at its current hash. (class_value.rs was fixed on main by ad60356.)