Skip to content

docs(skills): warn address-comments about stale git-blame fixup targets - #148

Merged
MrReasonable merged 1 commit into
mainfrom
chore/address-comments-fixup-retarget
Aug 16, 2026
Merged

MrReasonable merged 1 commit into
mainfrom
chore/address-comments-fixup-retarget

Conversation

@MrReasonable

Copy link
Copy Markdown
Owner

Summary

  • git blame names whichever commit last touched a line as of the CURRENT tree, but a later in-branch commit may have already rewritten that region without blame reflecting it -- a fixup committed against blame's answer then conflicts on autosquash. Recurred 6 times across 3 review-response rounds on PR MCP: write-capable tools for the operations an agent actually does every session #131/feat(mcp): write-capable tools for create_lead, dismiss_lead, apply_record, cv_run, cv_signoff #132, always resolved by retargeting.
  • Step 5 gains a verification recipe (git log --oneline <merge-base>..HEAD -- <file> for the last in-branch touch, git diff <candidate> -- <file> to confirm the hunk already matches) and guidance for splitting a fixup across files with different correct targets.
  • Step 8's blanket "conflict -> abort and escalate" is split into three shapes: a stale fixup target (safe, mechanical retarget), an import-list-style mechanical merge (safe to resolve by hand), and a genuine content clash (still escalate -- never resolve heuristically).

Test plan

  • Edits are confined to .rulesync/skills/address-comments/SKILL.md (the canonical source); no generated output needs regenerating/committing.
  • Full test suite + ruff green in this branch's worktree.

git blame names whichever commit last touched a line as of the current tree,
but in a multi-round review-response session an earlier round's own fixup can
have already rewritten the exact lines a new fix touches, without blame's
answer reflecting that a LATER commit also touched the region. A fixup against
the blame-named commit then conflicts on autosquash. Recurred 6 times across 3
review rounds on PR #131/#132, always resolved by retargeting to the actual
last in-branch commit touching the file (verified via git diff before
recommitting), never by falling back to a plain non-fixup commit.

Also refines Step 8's blanket "abort and escalate" instruction: a stale-target
conflict and a mechanical import-list merge are both safe to self-resolve
(no judgment call about what the code should do); only a genuine content
clash -- two different intended changes to the same logic -- still escalates.

MrReasonable <4990954+MrReasonable@users.noreply.github.com>
@coderabbitai

coderabbitai Bot commented Aug 16, 2026

Copy link
Copy Markdown

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: 2 minutes

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

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

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: 0565b88a-8cf7-475a-976e-c115c39b0ee5

📥 Commits

Reviewing files that changed from the base of the PR and between 6273db6 and ddccc9d.

📒 Files selected for processing (1)
  • .rulesync/skills/address-comments/SKILL.md

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

@MrReasonable
MrReasonable merged commit 1e26b9d into main Aug 16, 2026
10 checks passed
@MrReasonable
MrReasonable deleted the chore/address-comments-fixup-retarget branch August 29, 2026 19:23
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