Skip to content

docs(patterns): bank 3 recurring merge hazards into PATTERNS.md - #1491

Merged
POWERFULMOVES merged 1 commit into
mainfrom
docs/patterns-merge-hazards
May 16, 2026
Merged

docs(patterns): bank 3 recurring merge hazards into PATTERNS.md#1491
POWERFULMOVES merged 1 commit into
mainfrom
docs/patterns-merge-hazards

Conversation

@POWERFULMOVES

Copy link
Copy Markdown
Owner

Summary

Banks three recurring git/PR hazards into .claude/PATTERNS.md so every agent loading PMOVES context (5090/4090/SPARK/codex/Z890) sees them before driving a merge sequence.

Hazard Section added
Stacked-PR auto-close (merging base with --delete-branch closes the dependent) Prevention + Recovery sequence
Squash-merge rebase ("patch already upstream") git rebase --onto <new-base> <old-base-sha> pattern
Submodule gitlink conflict during rebase git update-index --cacheinfo 160000,<sha>,<path> workaround

Each 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 in project_cipher_3layer_gap.md). Re-bank in Cipher when that gap closes.

Test plan

  • Lint passes (markdown only, no CI changes)
  • No other PMOVES patterns docs need updates (sections added below "PR Review & Merge Workflow", before "UI Development Checklist")

🤖 Generated with Claude Code

…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>
@coderabbitai

coderabbitai Bot commented May 15, 2026

Copy link
Copy Markdown
Contributor

Warning

Rate limit exceeded

@POWERFULMOVES has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 58 minutes and 24 seconds before requesting another review.

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 @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

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 configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 8f763878-b01e-43d1-8583-586ada6a5cae

📥 Commits

Reviewing files that changed from the base of the PR and between 3d8ac3f and 7e7df48.

📒 Files selected for processing (1)
  • .claude/PATTERNS.md
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch docs/patterns-merge-hazards

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.

❤️ Share

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

@POWERFULMOVES
POWERFULMOVES merged commit 600d0d8 into main May 16, 2026
11 of 14 checks passed
@POWERFULMOVES
POWERFULMOVES deleted the docs/patterns-merge-hazards branch May 16, 2026 00:42
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.

2 participants