michaelhazza

Claudemerge — Git skill for Claude Code

Git community

Three-way merge of pending .framework-new conflicts in a consuming repo: auto-applies clean merges, surfaces genuine conflicts, hands back to /claudeupdate.

How to install Claudemerge

Installs to ~/.claude/commands/michaelhazza-claude-code-framework-claudemerge.md

Terminal

mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/michaelhazza/claude-code-framework/HEAD/.claude/commands/claudemerge.md -o ~/.claude/commands/michaelhazza-claude-code-framework-claudemerge.md

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

What Claudemerge does

description: "Three-way merge of pending .framework-new conflicts in a consuming repo: auto-applies clean merges, surfaces genuine conflicts, hands back to /claudeupdate."

/claudemerge

Resolve the `.framework-new` conflicts that pause `/claudeupdate`. Runs `scripts/framework-merge.cjs`, which reconstructs the BASE (the framework version the repo last applied, from `.framework-state.json`'s `lastAppliedFrameworkCommit` + the submodule's git history) and runs `git merge-file` per confl

Alternatives in Git

Triage Open Pull Requests — Review, label, and act on all open PRs for a repository using parallel review agents 10.8k ★
Fresh Start — The original nirholas/claude-code before DMCA and take down 6.2k ★
Push And Release — Git pull, resolve conflicts, push, fix hook errors, then release 1.6k ★