flow-merge · diff

git:20260930.785d7da to git:20261023.ff0bbdf

1 added, 0 removed. Audit A to A.

---

name: "flow-merge"

description: "Flow: Merge PR and Clean Up - Merge the current branch's PR, then clean up the worktree and branch."

---

## Codex harness adaptations

Generated from a Claude Code command. Where the procedure references these Claude-only surfaces, adapt as follows:

- Native worktrees (`EnterWorktree`/`ExitWorktree` tool calls, `.claude/worktrees/` paths): use plain git instead, with the worktree as a VISIBLE SIBLING of the repo - `git worktree add ../<repo>-<branch> -b <branch>` (or `$FLOW_WORKTREE_BASE/<repo>-<branch>` when that env var is set), work inside it, then `git worktree remove ../<repo>-<branch>` when done.

+ - `CLAUDE.md` references: read `AGENTS.md` first - it is the Codex entry point. Where it defers to `CLAUDE.md`, follow that pointer and `CLAUDE.md` is the rules; where it does not, `AGENTS.md` is. Where the repository has no `AGENTS.md`, read `CLAUDE.md`.

- Helper scripts referenced as `scripts/<name>` are bundled under `scripts/` in this skill directory (byte-identical copies from the claude-power-pack checkout); some expect sibling repo resources, so prefer a full checkout when one is available.

- Canonical guidance linked as `docs/<path>` is bundled under `docs/` in this skill directory (byte-identical copies from the claude-power-pack checkout). The source-relative `../../../docs/...` link in the command body resolves outside an installed skill, so the generated copy points at the bundled path instead. docs/ remains the only writable source.

- Network: this skill's bundled helpers appear to call the network (`gh`, `git fetch`/`push`, `curl`, `aws`, HTTP). Codex's workspace sandbox has no network, and an allow rule for `gh` covers only a top-level `gh` command, never one a helper runs. Run these helpers with escalated permissions. From inside the sandbox, "error connecting to api.github.com" means no network, not a GitHub outage or a bad login.

# Flow: Merge PR and Clean Up

Merge the current branch's PR, then clean up the worktree and branch.

## Full procedure

Read `reference.md` in this skill directory for the complete, authoritative procedure before acting on this skill.