docs(dev): merge policy + stacked-PR hygiene#3653
Conversation
Companion to docs/dev/git-workflow.md. Codifies the merge-button rule we just rolled out on protoMaker (squash for one-offs, merge commit for stacked PRs) and the local git config + stacking habits that keep rebases from fighting back. Repo settings already in line with this guidance: - allow_merge_commit=true, allow_squash_merge=true, allow_rebase_merge=true - merge_commit_title=PR_TITLE, merge_commit_message=PR_BODY - main ruleset: required_linear_history NOT set Adds back-link from git-workflow.md → merge-policy.md. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
|
Warning Review limit reached
Your plan currently allows 6 reviews/hour. Refill in 7 minutes and 57 seconds. Your organization has run out of usage credits. Purchase more in the billing tab. ⌛ How to resolve this issue?After more review capacity refills, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than trial, open-source, and free plans. In all cases, review capacity refills continuously over time. Please see our FAQ for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (2)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
Code Review — ? finding(s)
protoLabs Code Review Report
No findings recorded. |
Adds a "Don't squash-merge a parent PR while children are still open" section to Stack hygiene. We hit this in the same session shipping the #3597 stack: squash-merging the parent PR collapsed the head branch (delete_branch_on_merge: true on this repo) and the child PR refused to render with "Base ref must be a branch". Two recovery paths documented: 1. Preferred — keep "Create a merge commit" for stacked parents (the policy default already; this PR makes the failure mode explicit). 2. If you've already squash-merged — rebase the child onto main and re-target. Calls out the HEAD-vs-branch-name detached-HEAD trap on `git rebase --onto X Y Z`. Follow-up to PR #3653.
Adds a "Don't squash-merge a parent PR while children are still open" section to Stack hygiene. We hit this in the same session shipping the #3597 stack: squash-merging the parent PR collapsed the head branch (delete_branch_on_merge: true on this repo) and the child PR refused to render with "Base ref must be a branch". Two recovery paths documented: 1. Preferred — keep "Create a merge commit" for stacked parents (the policy default already; this PR makes the failure mode explicit). 2. If you've already squash-merged — rebase the child onto main and re-target. Calls out the HEAD-vs-branch-name detached-HEAD trap on `git rebase --onto X Y Z`. Follow-up to PR #3653. Co-authored-by: Automaker <automaker@localhost>
1 participant
Companion to `docs/dev/git-workflow.md`. Codifies the merge-button rule we just rolled out on protoMaker (squash for one-offs, merge commit for stacked PRs) and the local git config + stacking habits that keep rebases from fighting back.
Page outline
Repo settings already applied to protoMaker
Cross-links
🤖 Generated with Claude Code