/resolver
Git merge conflicts - resolve without losing intent.
$ npx -y skills add sipyourdrink-ltd/bernstein --skill resolver --agent claude-codeHow it fires
How this skill gets triggered: by you, by Claude, or both.
- Fires itselfAuto-invocation. Claude auto-loads it when your prompt matches the work.Auto-invocation is when the right skill fires by itself at the right moment, driven by a FLOW.md router and a hook, instead of you invoking it by name. It is the difference between a skill being installed and a skill actually getting used.Read the full definition →
- You can call itInvoke it directly when you want it.
- Slash command
/resolver
Context preview
The summary Claude sees to decide when to auto-load this skill.
Git merge conflicts - resolve without losing intent.
SKILL.md
resolver.SKILL.mdname: resolver description: Git merge conflicts - resolve without losing intent. trigger_keywords: - merge - conflict - resolver - rebase - three-way
Merge Conflict Resolver Skill
You resolve git merge conflicts between concurrent agent branches.
Specialization
- Reading both sides of a merge conflict to understand intent.
- Determining which changes to keep, combine, or rewrite.
- Preserving correctness from both branches.
- Ensuring the resolved code compiles, passes types, and maintains tests.
Work style
1. Read the conflict markers and surrounding context for each file. 2. Understand what each side was trying to accomplish. 3. Resolve by combining both intents where possible; pick one side only when they are truly incompatible. 4. After resolving all conflicts, run any available tests to verify. 5. Stage resolved files and commit.
Rules
- Only modify files listed in your task's `owned_files` (the conflicting files).
- Never discard changes silently - if you drop one side, explain why in
the commit message.
- Prefer combining both sides over picking a winner.
- If a conflict is ambiguous and cannot be safely resolved, mark the task
as failed with a clear explanation.
- Do not refactor, optimize, or "improve" code beyond what is needed to
resolve the conflict.
Deterministic orchestrator for CLI coding agents (Claude Code, Codex, Gemini CLI, +40 more). No model in the coordination loop, so parallel runs in per-task git worktrees replay byte-identically. Signed lineage plus an opt-in HMAC audit chain a reviewer checks offline, without rerunning it. Cluster mode, air-gap deploy. https://bernstein.run
Repo: sipyourdrink-ltd/bernstein
Other skills on bernstein.
- /bernstein-agents
Manage Bernstein agents - list active agents, inspect their output, kill stalled agents, or stream live logs. Use when the user asks about agents, wants to see what an agent is doing, or needs to kill one.
Open skill - /bernstein-alerts
Show active alerts from Bernstein - failed tasks, stalled agents, budget warnings, blocked tasks needing human intervention. Use when the user asks about problems, errors, warnings, or what needs attention.
Open skill - /bernstein-approve
Review and approve/reject pending tasks or plans in Bernstein. Use when the user asks about approvals, wants to review agent work, or needs to approve/reject a plan before execution begins.
Open skill - /bernstein-cost
Show detailed cost breakdown and budget status for the Bernstein orchestrator. Use when the user asks about spending, budget, cost per model, cost per agent, or wants a cost projection.
Open skill - /bernstein-create-task
Create a new task in the Bernstein orchestrator. Use when the user wants to add a task, delegate work to an agent, file a bug fix, or queue up work for the orchestrator to handle.
Open skill - /bernstein-plan
Create and manage multi-step execution plans in Bernstein. Plans decompose complex goals into stages with dependencies. Use when the user wants to plan a complex feature, break down a large task, or review an execution plan before agents start working.
Open skill