Skip to content

docs(rfcs): remove committed merge-conflict markers from the registry - #598

Merged
ragnorc merged 1 commit into
mainfrom
fix-rfc-registry-conflict-marker
Sep 1, 2026
Merged

docs(rfcs): remove committed merge-conflict markers from the registry#598
ragnorc merged 1 commit into
mainfrom
fix-rfc-registry-conflict-marker

Conversation

@ragnorc

@ragnorc ragnorc commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

Main's docs/rfcs/README.md carries 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.py passes (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.md so 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.

  • Resolves the registry text to a single clean statement.
  • Keeps RFC 0045 as the 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

Filename Overview
docs/rfcs/README.md Correctly removes conflict artifacts and stale reservation text without changing the registry's valid numbering guidance.

Reviews (1): Last reviewed commit: "docs(rfcs): remove committed merge-confl..." | Re-trigger Greptile

docs/rfcs/README.md carried literal <<<<<<>>>>>> conflict markers from
the #546 registry landing (commit 463fd70). Resolved to the marker's
own second side: RFC 0040 has landed, so its reservation sentence is
retired and only the next-available line remains.
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 1, 2026

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review Completed 2026-09-01T17:56:05.812004Z f449959 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@azimafroozeh
azimafroozeh self-requested a review September 1, 2026 17:54
@ragnorc
ragnorc merged commit 59db76c into main Sep 1, 2026
22 checks passed
@azimafroozeh azimafroozeh mentioned this pull request Sep 1, 2026
5 tasks
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