docs(patterns): bank 3 recurring merge hazards into PATTERNS.md - #1491
Conversation
…link rebase gotchas Three recurring git/PR hazards surfaced over multiple sessions (§9.4 close-out, MiniMax/FlOO$/submodule park session, W0 stack merge): 1. Stacked-PR auto-close — merging base with --delete-branch closes any dependent PR whose base is the deleted branch. Prevention: redirect dependent to main first. Recovery: recreate temp base, reopen, redirect, delete temp. 2. Squash-merge rebase — base PR squashed to main leaves dependent branches with redundant commits that conflict on naive rebase. Fix: git rebase --onto origin/main <original-base-sha> skips them. 3. Submodule gitlink conflict in rebase — checkout --ours is unreliable for gitlinks. Use git update-index --cacheinfo 160000,<sha>,<path> + commit --amend instead. Added to .claude/PATTERNS.md so every agent loading PMOVES context (5090/4090/SPARK/codex/Z890) sees these before driving a merge sequence. Cross-referenced from feedback memories feedback_stacked_pr_base_deletion.md and feedback_submodule_rebase_ours_gotcha.md. Future-state: re-bank in Cipher Memory once port 8105 exposure is restored (see project_cipher_3layer_gap.md). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
|
Warning Rate limit exceeded
You’ve run out of usage credits. Purchase more in the billing tab. ⌛ How to resolve this issue?After the wait time has elapsed, 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 the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Summary
Banks three recurring git/PR hazards into
.claude/PATTERNS.mdso every agent loading PMOVES context (5090/4090/SPARK/codex/Z890) sees them before driving a merge sequence.--delete-branchcloses the dependent)git rebase --onto <new-base> <old-base-sha>patterngit update-index --cacheinfo 160000,<sha>,<path>workaroundEach section includes both prevention (when applicable) and recovery (when you're already stuck).
Provenance
Hit during 3 sessions in the last 3 days:
Already banked in feedback memories (
feedback_stacked_pr_base_deletion.md,feedback_submodule_rebase_ours_gotcha.md). This PR moves them into the repo-level doc so they're cross-agent durable, not just local to one Claude's memory.Cipher follow-up
Ideal vessel for runtime recall is Cipher Memory via MCP (per
feedback_cipher_memory_usage.md), but Cipher's REST/MCP port 8105 isn't currently exposed (container marked healthy, internal API returns connection refused — same gap noted inproject_cipher_3layer_gap.md). Re-bank in Cipher when that gap closes.Test plan
🤖 Generated with Claude Code