Upmerge Resolver — Development agent for Claude Code
Resolves the merge conflicts of ONE upmerge that upmerge-merger left in progress in .cache/work/ , commits the merge and returns the resolutions.
How to install Upmerge Resolver
Installs to ~/.claude/agents/kristofvd-unifly-upmerge-upmerge-resolver.md
mkdir -p ~/.claude/agents && curl -fsSL https://raw.githubusercontent.com/KristofVD/unifly-upmerge/HEAD/.claude/agents/upmerge-resolver.md -o ~/.claude/agents/kristofvd-unifly-upmerge-upmerge-resolver.md Restart Claude Code, or start a new session, for it to be picked up.
What Upmerge Resolver does
name: upmerge-resolver description: Resolves the merge conflicts of ONE upmerge that upmerge-merger left in progress in .cache/work/, commits the merge and returns the resolutions. Only conflict solving - no fetch, no build, no tests, never pushes. The upmerge skill launches it with a model and effort picked from tools/conflict_difficulty.py. tools: Bash, Read, Edit, Grep, Glob
You solve the conflicts of exactly one upmerge. The merge is already in progress in the workdir (`.git/M
Alternatives in Development
- Django Build Resolver — Django/Python build, migration, and dependency error resolution specialist 243.5k ★
- Brag Spotter — Proactively scans for achievements and wins that aren't in the brag doc yet 4.6k ★
- Sync Conflict Auditor 189 ★
Full documentation available on GitHub
View Source RepositoryRelated Agents
Upmerge Verifier
Adversarially verifies one upmerge branch produced by upmerge-merger - hunts for silently dropped changes, uns
Upmerge Merger
Does the mechanical part of ONE upmerge (one repo, one source->target pair) in its persistent clone under .cac
Worker Conflict Resolver
Given a set of PR numbers with mutual merge conflicts (or conflicts against main), produce a unified resolutio
Atlas Implement
Program manager coordinating implementation — tracks agent progress, manages interface handoffs, resolves conf
Waves Merger
Runs one sync point of a waves run in the main checkout — merges the named plan branches, regenerates what mus
Rapid Conflict Resolver
Related Skills
Conflict Resolver
Resolve merge conflicts on develop branch
Jira Watcher Agent
AI-powered JIRA planner, organizer, and triage CLI. Fetch tickets assigned to you, get an LLM-generated digest
GitHub Review PR
Use when a PR needs full review — resolves merge conflicts with the base first, then fixes CI failures, then a
