Skip to content

[CHORE] fix merge conflict in main - #6986

Merged
rescrv merged 1 commit into
mainfrom
rescrv/fix-main
Apr 27, 2026
Merged

[CHORE] fix merge conflict in main#6986
rescrv merged 1 commit into
mainfrom
rescrv/fix-main

Conversation

@rescrv

@rescrv rescrv commented Apr 27, 2026

Copy link
Copy Markdown
Contributor

Description of changes

Two competing PRs for GC landed at the same time.

  • One adds a regions_and_topologies field.
  • One adds tests unwaware of that field.
    The merge doesn't make stuff build so main broke.

Test plan

CI + main merge queue

Migration plan

N/A

Observability plan

N/A

Documentation Changes

N/A

Two competing PRs for GC landed at the same time.
- One adds a regions_and_topologies field.
- One adds tests unwaware of that field.
The merge doesn't make stuff build so main broke.
@github-actions

Copy link
Copy Markdown

Reviewer Checklist

Please leverage this checklist to ensure your code review is thorough before approving

Testing, Bugs, Errors, Logs, Documentation

  • Can you think of any use case in which the code does not behave as intended? Have they been tested?
  • Can you think of any inputs or external events that could break the code? Is user input validated and safe? Have they been tested?
  • If appropriate, are there adequate property based tests?
  • If appropriate, are there adequate unit tests?
  • Should any logging, debugging, tracing information be added or removed?
  • Are error messages user-friendly?
  • Have all documentation changes needed been made?
  • Have all non-obvious changes been commented?

System Compatibility

  • Are there any potential impacts on other parts of the system or backward compatibility?
  • Does this change intersect with any items on our roadmap, and if so, is there a plan for fitting them together?

Quality

  • Is this code of a unexpectedly high quality (Readability, Modularity, Intuitiveness)

@propel-code-bot

Copy link
Copy Markdown
Contributor

Fix GC merge-conflict fallout by updating constructor/test call sites for new optional topology parameter

This PR resolves a main break caused by concurrent GC changes by aligning older call sites with the newer function/struct signatures that now include optional topology context. The fixes are minimal and mechanical: missing arguments/fields were added as None where MCMR topology data is not needed in tests or default test setups.

The updates are confined to garbage collector test and helper instantiations, restoring compile compatibility without changing runtime behavior. No production logic was altered beyond passing through the newly required optional parameter.

This summary was automatically generated by @propel-code-bot

@rescrv rescrv changed the title chore: fix merge conflict in main [CHORE] fix merge conflict in main Apr 27, 2026

@propel-code-bot propel-code-bot Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues were identified; the merge-conflict fix appears sound and ready to merge.

Status: No Issues Found | Risk: Low

Review Details

📁 4 files reviewed | 💬 0 comments

@rescrv
rescrv enabled auto-merge (squash) April 27, 2026 20:03
@rescrv
rescrv merged commit 3ecf5c7 into main Apr 27, 2026
160 of 185 checks passed
@rescrv
rescrv deleted the rescrv/fix-main branch April 27, 2026 23:22
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.

2 participants