Skip to content

chore(ledger): record PR #2091 merge-conflict resolution - #2092

Merged
BigSimmo merged 2 commits into
mainfrom
claude/pr-2040-merge-conflicts-pw1ysx
Aug 18, 2026
Merged

chore(ledger): record PR #2091 merge-conflict resolution#2092
BigSimmo merged 2 commits into
mainfrom
claude/pr-2040-merge-conflicts-pw1ysx

Conversation

@BigSimmo

Copy link
Copy Markdown
Owner

Summary

  • Immutable ledger record (npm run ledger:append) for the genuine merge-conflict resolution pushed to claude/patient-factsheets-search-regression-8iyvnd (PR fix(factsheets): route the mode home through the shared composer template #2091, commit 3cae468).
  • Context: PR fix(factsheets): route the mode home through the shared composer template #2091 rewrote src/components/factsheets/factsheets-home-page.tsx to route through the shared ModeHomeTemplate, deleting the hand-rolled "browse by topic"/"start with a factsheet" card grids entirely. Meanwhile main had separately merged PR Unify the card layer behind one category-identity registry #2060, which restyled that same grid (design-token/cn-helper adoption). git merge-tree correctly flagged this as a real content conflict — not staleness.
  • Resolved by merging origin/main into the PR branch and keeping the PR's rewritten file (git checkout --ours): the deletion supersedes the restyle, since the whole point of fix(factsheets): route the mode home through the shared composer template #2091 is removing that section. Verified the three helper exports it also removes (featuredFactsheets, categoryCount, factsheetCategoryGlyph) have no other callers anywhere in src//tests/ before pushing — categoryTheme, which stays exported, is still used by factsheet-detail-page.tsx and factsheets-search-page.tsx.
  • No product code is touched by this PR — it is the append-only bookkeeping for that resolution, per this repo's ledger-write discipline (content-addressed record files, never hand-edited).

Verification

  • npm run verify:pr-local — Verification not run: this PR adds a single append-only, content-addressed docs/branch-review-records/*.record.md file (no product code, config, or test changed) — Tier 1 per docs/process-hardening.md.
  • npm run verify:ui — not applicable, no UI/routing/styling changed.
  • npm run verify:release — not applicable, not a release/handoff request.

The actual resolution work (on PR #2091's branch) was verified there: git merge-tree --write-tree returned a clean tree after resolution, and grep -rn across src/ and tests/ confirmed no dangling references to the removed exports.

Risk and rollout

  • Risk: none — this PR is a single immutable ledger record.
  • Rollback: revert this commit; the record is independently removable.
  • Provider or production effects: None.

Notes


Generated by Claude Code

Immutable review record for the content-conflict resolution pushed to
claude/patient-factsheets-search-regression-8iyvnd (commit 3cae468).
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015qDHwBNZYyRLdJHqSkiYTg
@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, add credits to your account and enable them for code reviews in your settings.

@supabase

supabaseBot commented Aug 18, 2026

Copy link
Copy Markdown

This pull request has been ignored for the connected project sjrfecxgysukkwxsowpy because there are no changes detected in supabase directory. You can change this behaviour in Project Integrations Settings ↗︎.


Preview Branches by Supabase.
Learn more about Supabase Branching ↗︎.

@coderabbitai

coderabbitaiBot commented Aug 18, 2026

Copy link
Copy Markdown
Contributor

Warning

Review limit reached

You’ve reached a temporary PR review limit under our Fair Usage Limits Policy.

Your recent review volume is higher than typical usage, so adaptive limits are currently applied.

Next review available in:3 minutes

Limit details: You’ve used all 1 included review currently available under your plan. You completed 100 included PR reviews in the past 7 days; at that activity level, included reviews refill at 1 review per hour.

Your organization has reached its usage spending cap. Adjust your spending cap in the billing tab.

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: e39d4323-0f1c-4101-ab21-8e023525fde9

📥 Commits

Reviewing files that changed from the base of the PR and between 173ea9f and fdadc04.

📒 Files selected for processing (1)
  • docs/branch-review-records/85adbcb388f97e5cacd515137c05989fedfe4423caca99867b727f7a0011a965.record.md

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

@BigSimmo
BigSimmo enabled auto-merge (squash) August 18, 2026 05:38
@BigSimmo
BigSimmo merged commit 88fe4b9 into mainAug 18, 2026
24 checks passed
@BigSimmo
BigSimmo deleted the claude/pr-2040-merge-conflicts-pw1ysx branch August 18, 2026 05:39
Sign up for freeto 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

@BigSimmo@claude