merge

by davepoonCommand

Merge a completed Codex implementer's worktree back into its base_ref

Install this command

Copy the command definition below into:

~/.claude/commands/merge-davepoon.md

Command definition

---
description: Merge a completed Codex implementer's worktree back into its base_ref
disable-model-invocation: true
---

Parse `$ARGUMENTS`: first token is `agent_id`. Optional flags:
- `--strategy squash|ff|rebase` (default: squash)
- `--keep-worktree` (don't auto-remove after)
- `--message "commit msg"` (for squash strategy)

Call `magic-codex` MCP tool `merge`. On success, show the merged SHA and base ref. On conflict or other failure, surface the error and suggest manual resolution inside the worktree.

Details

Repository: davepoon/buildwithclaude
License: MIT
Last push: Jul 14, 2026

Categories & sources

Git & Workflow Code Review & Quality

Listed in: seed:davepoon/buildwithclaude, aggregator

Related Commands

caveman-commit

Generate terse caveman-style commit message

89.4k

caveman-review

One-line code review comments

89.4k

caveman-commit

Generate a terse caveman-style commit message for staged changes

89.4k