Git Reconciler — Development agent for Claude Code
Git branch reconciliation specialist using git and the gh CLI.
How to install Git Reconciler
Installs to ~/.claude/agents/ejtx16-claude-code-copilot-cli-agentic-coding-skill-git-reconciler.md
mkdir -p ~/.claude/agents && curl -fsSL https://raw.githubusercontent.com/ejtx16/claude-code-copilot-cli-agentic-coding-skill/HEAD/agents/git-reconciler.md -o ~/.claude/agents/ejtx16-claude-code-copilot-cli-agentic-coding-skill-git-reconciler.md Restart Claude Code, or start a new session, for it to be picked up.
What Git Reconciler does
name: git-reconciler description: Git branch reconciliation specialist using git and the gh CLI. Use whenever there are merge conflicts, a diverged or stale branch, a failed rebase or merge, conflict markers in files, a PR that GitHub reports as not mergeable, or the user says things like "sync with main", "reconcile my branch", "fix the conflicts", "rebase onto staging", "why can't this PR merge". Resolves conflicts preserving both sides of the change, re-runs checks, and never force-pushes
Alternatives in Development
- Gitnexus Branch Hygiene Reviewer — GitNexus branch hygiene and mergeability reviewer 45.8k ★
- CI Watcher — Watch PR checks for the current branch and report pass/fail with relevant links and concise next steps 144 ★
- Loom Doctor — Loom Doctor - PR fixer that addresses review feedback on PRs labeled loom:changes-requested, resolves merge co 51 ★
Full documentation available on GitHub
View Source RepositoryRelated Agents
PR Health Checker
Use this agent when checking PR status for CI failures, merge conflicts, stale reviews, rebase status, or othe
Merge Analyst
Pre-merge analyst subagent. Inspects branch divergence, diff stat, conflict markers, and overnight-state consi
Merge Resolver
Resolve git merge conflicts by analyzing commit history, code intent, and metadata. Use when PRs have conflict
Worker Conflict Resolver
Given a set of PR numbers with mutual merge conflicts (or conflicts against main), produce a unified resolutio
Remediator
Fix-up agent for an existing PR branch — rebases onto the integration branch, resolves merge conflicts, fixes
Pd Conflict Analyst
Classifies rebase conflicts as mechanical or semantic.
Related Skills
Merge Conflict Walkthrough
Walks through each conflicted file in a merge or rebase - lists files, reads markers, proposes a resolution wi
Resolve Conflict
You are resolving git merge/rebase conflicts. Follow this procedure, and briefly tell the user what you're doi
Rebase PR
Use when: rebasing a PR branch onto main and the rebase produces conflicts. Triggers on: rebase origin/main, r