docs: squash merge リポジトリでの merged branch 削除ルールを CLAUDE.md に追記#356
Merged
Conversation
- scripta は全 PR squash merge のため `git branch -d` が「未 merge」で拒否される - merged 確認済みのブランチは `git branch -D` を使う旨を Issue・PR 節に明記 - session 104 / 105 で同じ skill drift が 2 回再発したことに対する学びの昇格 (CLAUDE.md ルール「同じ指摘を 2 回受けたら追記提案」の閾値到達)
ymnao
added a commit
that referenced
this pull request
Jul 18, 2026
- ci.yml の push / pull_request に paths-ignore (**/*.md, docs/**, .github/ISSUE_TEMPLATE/**) を追加 - ci-skip.yml を新規追加: 補完する paths filter で trigger され、 ci.yml の各 required check (lint / typecheck / test / e2e / electron-e2e / build / dependency-review) を stub success で提供 - codeql.yml + codeql-skip.yml と同じ pattern・同じ path 定義で揃える - HANDOFF §1 対応 (PR #356 の CLAUDE.md 1 行追記でも e2e 全 job が 走った件を解消)
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.
概要
CLAUDE.md「Issue・PR」節に、squash merge リポジトリでの merged branch 削除ルールを 1 行追記。
関連 Issue
なし (学びの昇格)
移行 Stage
該当なし (ドキュメント)
変更内容
scriptaは全 PR squash merge のためgit branch -dが「未 merge」判定で拒否される旨を明記gh pr view <num> --json state) のブランチ削除はgit branch -Dを使う運用を明文化/nextskill が-d拒否で停止した場合の対応 (merged 確認 →-D) も併記動作確認
背景
session 104 / 105 で同じ skill drift が 2 回連続発生。CLAUDE.md ルール「同じ内容の指摘・訂正を 2 回受けたら CLAUDE.md または該当 skill への追記を提案する」の閾値到達により、HANDOFF §「未完了・次にやること 1. 学びの昇格」で user 判断待ちだった提案 (a) を採用。提案 (b)「/next skill 拡張」は skill 側変更で影響大 (かつ dotfiles 配下で不可侵) のため不採用。
検証エビデンス
リスク分類
tier: high — agent-config: CLAUDE.md (classify-risk.sh 出力)
実行した検証
レビュー指摘と対応
codex-review 全 3 観点で 0 findings。対応事項なし。
追跡先
なし
Draft 判定