Skill570 repo starsupdated today

resolver

The resolver skill analyzes git merge conflicts across concurrent agent branches and determines which changes to retain, combine, or rewrite while preserving intent from both sides. Use this when merging agent work that has conflicting modifications to the same files, requiring intelligent resolution that maintains code correctness and test compatibility without silently discarding changes.

View source Repository: bernstein

Install in Claude Code

Copy

git clone --depth 1 https://github.com/sipyourdrink-ltd/bernstein /tmp/resolver && cp -r /tmp/resolver/templates/skills/resolver ~/.claude/skills/resolver

Then start a new Claude Code session; the skill loads automatically.

Definition

SKILL.md

# 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.