flow-merge ยท diff
git:20260725.37735aa to git:20260811.98c8688
1 added, 1 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."
---
<!-- GENERATED by claude-power-pack - scripts/codex-skill-sync.py; edit .claude/commands/flow/merge.md instead -->
## 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 - `git worktree add <path> -b <branch>`, work inside it, then `git worktree remove <path>` when done.
+ - 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.
- 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.
# 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.