OpenParable
Skip to content
← Back to skills

Resolver

Development
resolver

Resolver is an Agent Skill for development published in the sipyourdrink-ltd/bernstein repository on GitHub: a SKILL.md instruction file an AI agent can load to do this task.

Git merge conflicts - resolve without losing intent.

View on GitHub ↗
QUICK START

How to use this skill

Bring this guide into your coding agent with a prompt tailored to the tool you use.

  1. Open your project in Codex.
  2. Copy and paste the prompt below.
  3. Review files and risks before approving any action.
Prompt to paste
Inspect the Agent Skill at https://github.com/sipyourdrink-ltd/bernstein/blob/HEAD/templates/skills/resolver/SKILL.md and all supporting files. Report provenance, permissions, scripts, dependencies, and security risks. Propose an exact installation into .agents/skills/resolver, but wait for my approval before writing files or running scripts.

Copying this prompt does not install or run the skill. Review third-party files before use.

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.