Resolver

What the source does

• FilesystemNone observedNo reads or writes in the source
• NetworkNone observedNo outbound calls in the source
• ShellNone observedNo commands run in the source
• DependenciesPinnedNothing floats
• SecretsNone foundNo keys in source

Five audit layers

Gates applied: no behavioural pass.

Audit 0.4.1 · source sha 6ba64a7d2489 · 14 Oct 2026Report an issue or request a re-scan

• Publishersipyourdrink-ltd GitHub organizationOwner of the repository this skill is read from
• Source foldersipyourdrink-ltd/bernstein/templates/skills/resolverThe exact folder we audited
• LicenceApache-2.0As the repository states it
• Commit pinned for this verdict6ba64a7d2489A new audit runs when the source changes
• Repository statusNot archivedPushed today
• Sandboxed runNot runSkills are read, not executed; layer L4 is skipped

Its description: Git merge conflicts - resolve without losing intent.

---
name: 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.

Excerpt, first 1,325 characters of SKILL.md, verbatim from the audited commit. It is text from someone else’s repository, quoted so you can judge it before your agent reads it.

git clone https://github.com/sipyourdrink-ltd/bernstein
git -C bernstein checkout 6ba64a7d2489

Works in

1. 2026-10-14
   ✓SAFE B 89 / 100

   first audit · source 6ba64a7d2489

Questions about Resolver

• github.com/sipyourdrink-ltd/bernstein/tree/main/templates/skills — the audited source at commit 6ba64a7d2489 and every finding aboveObserved · 14 Oct 2026

Spotted something wrong? Report a correction · Methodology