Skip to content

docs(claude): green PRs merge without asking — resolve the merge-rule contradiction - #10

Merged
github-actions[bot] merged 1 commit into
masterfrom
claude-merge-policy
Aug 7, 2026
Merged

docs(claude): green PRs merge without asking — resolve the merge-rule contradiction#10
github-actions[bot] merged 1 commit into
masterfrom
claude-merge-policy

Conversation

@catomean

@catomean catomean commented Aug 7, 2026

Copy link
Copy Markdown
Collaborator

The commit policy said "ask before merging a PR", agreeing with the background-job boilerplate — while the standing feedback memory said the opposite (George never opens GitHub; agents review, merge, deploy, verify live). Every background session hit the same three-way conflict; it was overridden by hand 3×. Resolved 2026-08-07 in favor of shipping: a CI-green, non-draft PR on a feature branch in George's own repos IS the deliberate step. Force-pushes, direct default-branch pushes, red/foreign PRs, deletions, and publishing beyond a normal deploy still require asking.

🤖 Generated with Claude Code

… contradiction

The commit policy said "ask before merging a PR", which agreed with the
background-job "never merge" boilerplate — while the standing feedback memory
(feedback-ship-without-pr-review) said the opposite: George never opens GitHub;
agents review, merge, deploy, and verify live. Every background session hit the
same three-way conflict and stalled on it (overridden by hand 3x).

Resolved in favor of shipping, as confirmed 2026-08-07: a CI-green, non-draft PR
on a feature branch in George's own repos IS the deliberate step — the pipeline
(branch + CI + review) is the gate, not a human clicking a button. Force-pushes,
direct pushes to default, red/foreign PRs, deletions, and publishing beyond a
normal deploy still require asking.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@github-actions
github-actions Bot merged commit c6a13f1 into master Aug 7, 2026
1 check passed
@github-actions
github-actions Bot deleted the claude-merge-policy branch August 7, 2026 19:16
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