Upmerge Merger — Development agent for Claude Code
Does the mechanical part of ONE upmerge (one repo, one source->target pair) in its persistent clone under .cache/work.
How to install Upmerge Merger
Installs to ~/.claude/agents/kristofvd-unifly-upmerge-upmerge-merger.md
mkdir -p ~/.claude/agents && curl -fsSL https://raw.githubusercontent.com/KristofVD/unifly-upmerge/HEAD/.claude/agents/upmerge-merger.md -o ~/.claude/agents/kristofvd-unifly-upmerge-upmerge-merger.md Restart Claude Code, or start a new session, for it to be picked up.
What Upmerge Merger does
name: upmerge-merger description: Does the mechanical part of ONE upmerge (one repo, one source->target pair) in its persistent clone under .cache/work. Mode "prepare" creates the merge branch, runs the merge and, when it conflicts, scores the conflicts and stops so upmerge-resolver can solve them; a clean merge goes straight on to validation. Mode "validate" checks markers, compiles, runs unit tests and returns the dossier. Never resolves real conflicts, never pushes. Use from the upmerge s
Alternatives in Development
- Gitnexus Branch Hygiene Reviewer — GitNexus branch hygiene and mergeability reviewer 45.8k ★
- Template Auditor — Use this agent whenever Pulkit wants an existing premium-template clone in the fable repo audited against its 509 ★
- PR Prep — Use this agent when the user wants to prepare a pull request, review changes before PR submission, generate PR 90 ★
Full documentation available on GitHub
View Source RepositoryRelated Agents
Upmerge Resolver
Resolves the merge conflicts of ONE upmerge that upmerge-merger left in progress in .cache/work/ , commits the
Upmerge Verifier
Adversarially verifies one upmerge branch produced by upmerge-merger - hunts for silently dropped changes, uns
PR Merger
Use for gh pr merge and gh pr ready only. Operator confirmation is REQUIRED for every merge or ready-mark. A B
Phase C Merger
Phase C subagent: verify merge gate and AC, then run the canonical /wrap merge flow when authorized.
Merger
Reviews, validates, and merges arc-agents PRs. Sole authority for destructive git ops (rebase, push, merge, br
Waves Merger
Runs one sync point of a waves run in the main checkout — merges the named plan branches, regenerates what mus
Related Skills
Conflict Resolver
Resolve merge conflicts on develop branch
Merge Main
Merge the latest origin/$MAIN_BRANCH into the current branch, resolve conflicts preserving both sides' intent,
Hybrid Complete
Complete Hybrid Ralph task in worktree, verify all stories complete, commit code changes (excluding planning f