batch-merge

分类: 文档与知识管理 | 上传者: lhpaul | 下载: 0 | 版本: v1.0（最新）

将并行批次中所有准备好的 PR 合并为按顺序开发，自动解决琐碎的 CHANGELOG 和文档冲突，暂停以等待人工输入重要的内容，并为每个成功合并的 PR 运行合并后清理。当一批并行 PR 准备好合并时使用。

更新日志: Source: GitHub https://github.com/lhpaul/ai-dev-framework-template

目录结构

当前层级: tree/main/.codex/skills/batch-merge/

📁 agents/
- 📄 openai.yaml 1.3 KB
📄 SKILL.md 3.1 KB

SKILL.md

---
name: batch-merge
description: Merge all ready PRs in a parallel batch into develop sequentially, auto-resolving trivial CHANGELOG and documentation conflicts, pausing for human input on non-trivial ones, and running post-merge-cleanup for each successfully merged PR. Use when a parallel batch of PRs is ready for merge.
---

# Batch Merge

Follow `docs/workflow/development-workflow/protocols/94-batch-merge-protocol.md` exactly.

1. **Auto-discovery mode** (no explicit PR numbers): run:

   ```bash
   ./scripts/development-workflow/batch-merge.sh discover
   ```

   If `DISCOVERY_RESULT=none`, exit immediately with an informational message — no merges occur.

2. **Explicit PR list** (PR numbers provided by the human): run:

   ```bash
   ./scripts/development-workflow/batch-merge.sh discover --prs <num1,num2,...>
   ```

3. Display the candidate summary table (PR number, title, branch, labels, readiness status).

4. **Readiness gate**: for each PR missing `ready-for-human-review`, warn the human and require an explicit include-or-skip decision. Never silently include or skip.

5. **Human confirmation**: present the final ordered merge plan and require explicit approval before any merge.

6. **Sequential merge loop (human-confirmed, agent-executed)**: after the human approves the merge plan in Step 5, for each PR in order:
   - Run `./scripts/development-workflow/batch-merge.sh merge --pr <number>`
   - On `MERGE_RESULT=clean`: proceed to post-merge steps.
   - On `MERGE_RESULT=conflict`: classify each conflicted file:
     - `CHANGELOG.md`: auto-resolve by combining all `[Unreleased]` entries (HEAD side first, incoming side second, no entries dropped). Report what was combined.
     - Documentation files (`docs/`, `.claude/`, `.cursor/`, `.codex/`): auto-resolve if non-overlapping; escalate if overlapping.
     - All other files (or overlapping doc changes): pause, show conflict markers, wait for human to resolve or abort.
   - On `MERGE_RESULT=failed`: report the error, mark `failed`, continue.
   - After each successful merge: complete the post-merge sequence from Protocol 94 Step 4.2 (`git push origin develop`, verify GitHub shows `MERGED`, delete the remote branch if it still exists, create a temporary local branch if needed, then run `./scripts/development-workflow/post-merge-cleanup.sh <branch>`).

7. **Final summary**: always print a table listing every candidate PR with its outcome code (`merged_clean`, `merged_auto`, `merged_human`, `skipped_not_ready`, `skipped_conflict`, `failed`, `not_attempted`).

Key rules:

- Never leave `develop` in a conflicted state — always run `git merge --abort` if a conflict cannot be resolved.
- Do not force-push or rebase PR branches.
- Do not use `gh pr close` — the merge must be recognized by GitHub as `MERGED`.
- Already-merged PRs stay merged even if the human aborts mid-batch.
- `git push origin develop` failures are **batch-fatal**: stop processing further PRs immediately, run `git merge --abort` if a conflict exists, surface a clear error, and require human intervention before resuming.
- `post-merge-cleanup` failures are reported but do not stop remaining merges.

登录后下载/点赞/收藏 ❤ 5 | ★ 0

batch-merge

目录结构

SKILL.md

举报内容

提示