thomas-sodon

Merge Main — Git skill for Claude Code

Git community

Merge the latest origin/$MAIN_BRANCH into the current branch, resolve conflicts preserving both sides' intent, run the quality gates, and push.

How to install Merge Main

Installs to ~/.claude/commands/thomas-sodon-claude-code-pipeline-merge-main.md

Terminal

mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/thomas-sodon/claude-code-pipeline/HEAD/.claude/commands/merge-main.md -o ~/.claude/commands/thomas-sodon-claude-code-pipeline-merge-main.md

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

What Merge Main does

Merge the latest `origin/$MAIN_BRANCH` into the current branch, resolve conflicts preserving both sides' intent, run the quality gates, and push.

Configuration

Read the `## Pipeline config` section of the project's root `CLAUDE.md`:

MAIN_BRANCH — integration branch (default main).
QUALITY_GATES — full gate command, exit 0 when green. If missing, stop with error=missing_quality_gates and ask the user to add it.
GATE_WRAPPER — optional prefix for every gate run (e.g. `.claude/

Alternatives in Git

Ws Reset — Reset the current branch to main, fetch upstream, and update submodules 38.1k ★
Worktree Deliver — Commit all work, push, and create a pull request from the current worktree 23.4k ★
Push And Release — Git pull, resolve conflicts, push, fix hook errors, then release 1.6k ★