Skip to content

fix(gc): resolve committed conflict markers in gc_runtime_root_holders.json from #11815 - #11848

Merged
proggeramlug merged 1 commit into
mainfrom
fix-conflict-markers-11843-11815
Oct 3, 2026
Merged

proggeramlug merged 1 commit into
mainfrom
fix-conflict-markers-11843-11815

Conversation

@proggeramlug

@proggeramlug proggeramlug commented Oct 3, 2026 •

Copy link
Copy Markdown
Contributor

#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.)

@coderabbitai

coderabbitai Bot commented Oct 3, 2026

Copy link
Copy Markdown

Review in Change Stack →

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
  • Configuration used: defaults
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: bb48859b-78a2-4859-a3d6-a787ffaaad89
📥 Commits

Reviewing files that changed from the base of the PR and between f5dcf1f and 2a1ce4b.

📒 Files selected for processing (3)
  • crates/perry-abi/src/lib.rs
  • crates/perry-runtime/src/object/class_value.rs
  • scripts/gc_runtime_root_holders.json
 _____________________
< sync; sync; review; >
 ---------------------
  \
   \   \
        \ /\
        ( )
      .( o ).
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

…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
proggeramlug force-pushed the fix-conflict-markers-11843-11815 branch from 2a1ce4b to 63ff563 Compare October 3, 2026 22:36
@proggeramlug proggeramlug changed the title fix(runtime): resolve committed conflict markers from #11843 and #11815 fix(gc): resolve committed conflict markers in gc_runtime_root_holders.json from #11815 Oct 3, 2026
@proggeramlug
proggeramlug merged commit 4880326 into main Oct 3, 2026
20 of 21 checks passed
@proggeramlug
proggeramlug deleted the fix-conflict-markers-11843-11815 branch October 3, 2026 22:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant