michaelhazza

Claudemerge

Name: Claudemerge
Author: michaelhazza

Git community

SOURCE https://github.com/michaelhazza/claude-code-framework/blob/main/.claude/commands/claudemerge.md

Description

--- 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

Installation

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.