Repository navigation
feat(workflow): mechanical merge-conflict fixups keep review coverage - #2270
Closed
timothyfroehlich wants to merge 2 commits into
Closed
timothyfroehlich wants to merge 2 commits into
timothyfroehlich wants to merge 2 commits into
Conversation
… (PP-8.12) Extends the §8.12 pure-merge-from-main exception: a merge-conflict resolution or migration renumbering keeps prior review coverage when every such commit carries a `Mechanical-Resolution: <what you resolved>` trailer attesting no logic changed. Manual conflict resolution previously always broke the tree-match check and forced a fresh review round even for trivial import-path or migration-number collisions. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
|
Important Draft PR not reviewedDraft PRs are not automatically reviewed by default.
To automatically review draft PRs, update your CodeRabbit configuration: reviews:
auto_review:
drafts: trueComment |
…solution The suffix text changed from "pure merge from main" to "pure merge or mechanical resolution from main"; update the five test_pr_gates.py assertions that pinned the old wording. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Owner
Author
This branch was successfully deployed
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
1 participant
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.
Summary
Mechanical-Resolution: <what you resolved>trailer attesting no logic changed — previously any manual conflict resolution broke coverage and forced a fresh review round, even for trivial import-path or migration-number collisions.git log.scripts/workflow/_pr-gates.sh(_has_mechanical_trailer, extended_is_pure_merge_from_main),docs/feature-specs/pr-lifecycle-monitoring.md§8.12 + changelog,REVIEW.md,AGENTS.md,scripts/workflow/AGENTS.md, and.agents/skills/pinpoint-pr-workflow/SKILL.md.Test plan
bash -n scripts/workflow/_pr-gates.shpnpm run check(pre-existing unrelated warnings only)_has_mechanical_traileragainst a synthetic repo (trailered vs. untrailered commit)🤖 Generated with Claude Code