zircote

Aw Merge — Git skill for Claude Code

Git community

Merge develop branch to main with PR, CI check, and squash merge.

How to install Aw Merge

Installs to ~/.claude/commands/zircote-github-agentic-workflows-aw-merge.md

Terminal

mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/zircote/github-agentic-workflows/HEAD/.claude/commands/aw-merge.md -o ~/.claude/commands/zircote-github-agentic-workflows-aw-merge.md

Restart Claude Code, or start a new session, for it to be picked up.

What Aw Merge does

description: Merge develop branch to main with PR, CI check, and squash merge argument-hint: "[--dry-run] [--no-reset]"

/aw-merge

Weekly merge of `develop` into `main`. Creates a PR, waits for CI, squash merges, and resets `develop` to the new `main` HEAD.

Usage

/aw-merge               → Full merge cycle
/aw-merge --dry-run     → Show what would be merged, do not create PR
/aw-merge --no-reset    → Merge but do not reset develop to main after

Flags

--dry-run — S

Alternatives in Git

Ws Reset — Reset the current branch to main, fetch upstream, and update submodules 38.1k ★
OSS PR — Commit + PR workflow for open source contributions: auto-creates a user-prefixed branch when on main/master, t 19.7k ★
Merge Command — Finalize worktree work: update docs, commit, merge to main, clean up 1.3k ★