docs(rfcs): remove committed merge-conflict markers from the registry - #598
Merged
Conversation
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
azimafroozeh
self-requested a review
September 1, 2026 17:54
azimafroozeh
approved these changes
Sep 1, 2026
5 tasks
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.
Main's
docs/rfcs/README.mdcarries literal conflict markers (<<<<<<< HEAD…>>>>>>> 463fd70e (review)) from the #546 registry landing — visible in the rendered registry. Resolved to the post-#546 truth: RFC 0040 has landed, so the reservation sentence is retired and only the next-available line (0045) remains. Docs-only;python3 scripts/check-docs.pypasses (it does not scan for markers — possibly worth adding).Note
Low Risk
Documentation-only cleanup with no runtime or contract impact.
Overview
Removes committed Git merge-conflict markers from
docs/rfcs/README.mdso the RFC registry renders correctly.The resolved “next available number” line keeps only that 0045 is next and that lower gaps must not be reused, dropping the obsolete note that RFC 0040 was reserved by PR #546 now that 0040 has landed.
Reviewed by Cursor Bugbot for commit f449959. Bugbot is set up for automated code reviews on this repo. Configure here.
Greptile Summary
Removes committed merge-conflict markers and obsolete RFC 0040 reservation wording from the RFC registry while preserving the correct next-available number.
Confidence Score: 5/5
The PR appears safe to merge with no actionable issues identified.
The documentation now reflects the existing RFC registry: RFC 0040 has landed, RFC 0044 is the highest assigned entry, and RFC 0045 remains the correct next available number.
Important Files Changed
Reviews (1): Last reviewed commit: "docs(rfcs): remove committed merge-confl..." | Re-trigger Greptile