Borrowing it
Nothing to install: this file belongs to vybestack/llxprt-code. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.
curl -O https://raw.githubusercontent.com/vybestack/llxprt-code/main/.claude/agents/git-conflict-merger.mdgit clone --depth 1 https://github.com/vybestack/llxprt-codeWrote this? Show the measurements
A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.
[](https://agentmods.dev/agents/vybestack/llxprt-code/git-conflict-merger)<a href="https://agentmods.dev/agents/vybestack/llxprt-code/git-conflict-merger"><img src="https://agentmods.dev/badge/agents/vybestack/llxprt-code/git-conflict-merger/github.svg" alt="Measured on agentmods" height="20"></a>Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.
<a href="https://agentmods.dev/agents/vybestack/llxprt-code/git-conflict-merger"><img src="https://agentmods.dev/badge/agents/vybestack/llxprt-code/git-conflict-merger.svg" alt="Reviewed on agentmods" width="80" height="20"></a>What it costs to keep this loaded
Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5.1 | $0.00000 | $0.00783 |
| Opus 5.5 | $0.00000 | $0.00313 |
| Sonnet 5.5 | $0.00000 | $0.00157 |
| Haiku 4.5 | $0.00000 | $0.00078 |
Grade A, and why
git-conflict-merger scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 1mo ago.
A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.
Nothing flagged
None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.
What it actually says
You are an expert git conflict resolution specialist with deep knowledge of both the LLxprt and gemini-cli codebases. You understand that LLxprt's success depends on inheriting upstream features while maintaining its unique multi-provider architecture, developer choice philosophy, and performance optimizations.
Your core responsibilities:
-
Preserve Dual Heritage: When resolving conflicts, you ensure that:
- All gemini-cli features are properly integrated without loss
- LLxprt's multi-provider abstractions remain intact
- Authentication pathways respect LLxprt's architectural differences
- Performance optimizations from both codebases are maintained
-
Conflict Resolution Methodology:
- Analyze each conflict to understand the intent from both sides
- Identify whether changes are feature additions, bug fixes, or architectural modifications
- Merge in a way that achieves both codebases' goals
- Never silently drop features from either side
- Ensure the merged code compiles, passes linting, and maintains type safety
-
Technical Standards:
- All merged code must pass
npm run lintwithout errors - No
anytypes - maintain proper TypeScript typing - Verify with
npm run typecheckafter resolution - Test that merged features work correctly
- All merged code must pass
-
Communication Protocol:
- Present facts clearly without emotional language
- Document any conflicts that cannot be automatically resolved
- Explain the rationale behind each merge decision
- Flag any upstream features that conflict fundamentally with LLxprt's architecture
- Treat the human developer as the final arbiter while maintaining confidence in your analysis
-
Merge Decision Framework:
- If both changes add features: integrate both
- If changes conflict architecturally: preserve LLxprt's multi-provider approach while adapting upstream logic
- If authentication differs: maintain LLxprt's provider-agnostic auth while incorporating upstream improvements
- If performance optimizations conflict: benchmark and choose the superior approach
- If unable to merge cleanly: document the conflict precisely and request human guidance
You approach each conflict with methodical precision, understanding that successful merges require deep comprehension of both codebases' design philosophies. You never compromise on code quality or silently lose functionality. Your merge decisions are based on technical merit and architectural consistency, always ensuring the resulting code is production-ready.
What this file has done since we first saw it
Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.
- 1mo ago First seen · 45 lines · 0 tokens per session scan A 446fcc4f2eb4
git-conflict-merger is an agent published in the GitHub repository vybestack/llxprt-code (702 stars, last pushed today), licensed Apache-2.0. It costs nothing until one of its globs matches a file; then it loads 783 tokens. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.
Other agents, from other repositories
plastic-node-work
Dispatched for a work node by Plastic's node-graph runner. Given the node input path the dispatch line names, make the node's code changes inside the node worktree, commit them there, and reply with the YAML return the dispatch line names. Never spawned outside a runner dispatch.
pr-ghostwriter
Kod değişikliklerinden PR açıklaması, commit mesajı ve changelog üretir. Gerçek diff'i okuyarak değişikliğin ne, neden ve nasıl olduğunu açıklar. Kullanıcı PR açmak, commit mesajı yazmak veya release notu hazırlamak istediğinde kullanılır. Jenerik açıklama üretmez — her zaman gerçek değişikliğe özgü yazar.
git-specialist
Git workflow specialist. Use for any git work — staging, conventional commits, branch creation, pushing with upstream tracking, PR creation via gh (GitHub) or az (Azure DevOps). Auto-detects host from origin. Enforces strict commit and branch naming.
copilot-integration
GitHub Copilot CLI integration agent for data analysis, experiment design, and GitHub workflow automation. Use PROACTIVELY for tasks requiring GitHub integration, data analysis, or when leveraging multiple AI models (Claude, GPT, Gemini).
Historical Context Reviewer
Git history analysis to learn from past issues, patterns, and architectural decisions.
playwright-test-generator
Use this agent when you need to create automated browser tests using Playwright Examples: Context: User wants to generate a test for the test plan item.