Claude-skill-registry-data merging-branch

Merges a branch into current branch with conflict resolution. Use when: user wants to merge, combine branches, or integrate changes.

install
source · Clone the upstream repo
git clone https://github.com/majiayu000/claude-skill-registry-data
Claude Code · Install into ~/.claude/skills/
T=$(mktemp -d) && git clone --depth=1 https://github.com/majiayu000/claude-skill-registry-data "$T" && mkdir -p ~/.claude/skills && cp -r "$T/data/merge" ~/.claude/skills/majiayu000-claude-skill-registry-data-merging-branch && rm -rf "$T"
manifest: data/merge/SKILL.md
source content

Merge Skill

Execute

/merge
or
/merge <branch>
slash command.

See merge.md for workflow.