Ready to supercharge your AI agents?

Install any skill in seconds. Free to start, no credit card required.

Get Started Free →

Resolve Merge Conflicts · stevesolun | DecimalAI

code reviewby stevesolun

Resolve Merge Conflicts

stevesolun/resolving-merge-conflicts

Source stevesolun/ctx ↗License MIT

Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides.

NewMaintained

Automatic

Coding pack

Last verified 9/25/2026

What it changes

7 of 22 test cases passed with the skill.

Pass-rate lift: —
Tokens: -6%
Agent turns: 0%
Response time: +2%

Model gemini-3.6-flashMeasured 9/25/2026v17 of 22 cases passed with skill · 7 comparable

Tokens, turns and time describe resource use, not a dollar price.

Lift withheld: 7 comparable cases; this report requires 8.

Use this skill

Save it into your project's skills folder. Claude Code picks it up in its next session.

curl -fsSL --create-dirs -o .claude/skills/stevesolun-resolving-merge-conflicts/SKILL.md https://app.decimal.ai/s/stevesolun-resolving-merge-conflicts/SKILL.md

Want it pinned and updatable? pip install "decimalai>=0.15", then decimalai skills add stevesolun-resolving-merge-conflicts, and start Claude Code with claude --plugin-dir "$(git rev-parse --show-toplevel)/.agents"

1 · One-time — install the CLI (docs ↗)

pip install "decimalai>=0.15"

2 · Get the skill — writes .agents/skills/stevesolun-resolving-merge-conflicts/ and pins it in .decimal/skills.lock

decimalai skills add stevesolun-resolving-merge-conflicts

No CLI? Get the same file — curl · raw file

curl -fsSL --create-dirs -o .claude/skills/stevesolun-resolving-merge-conflicts/SKILL.md https://app.decimal.ai/s/stevesolun-resolving-merge-conflicts/SKILL.md

Raw file: /s/stevesolun-resolving-merge-conflicts/SKILL.md ↗ · machine-readable summary at /s/stevesolun-resolving-merge-conflicts.json ↗

Safety checks: 3 of 3 passed

Code scan CleanIntent PassedContent Clean

See it in action

A test case the skill fixed. Same model, same prompt, with and without the skill.

Prompt

I had conflicts in `config/database.yml` and `app/models/db.rb`. I asked you to fix them, test them, and complete the merge. What essential reporting elements should you provide in your final response?

What was checked, without and with the skill
Checked	Without skill	With skill
The assistant states that reported details must include what was resolved.	Passed	Passed
The assistant states that reported details must include what was verified.	Passed	Passed
The assistant states that reported details must include any remaining uncertainty.	Missed	Passed

case-12 · gemini-3.6-flash · 9/25/2026 · answers are capped and redacted

What's inside

The instructions your model reads when the skill loads.

SKILL.md19 linessingle file

Resolve Merge Conflicts

Inspect the current Git state, the operation in progress, its goal, and every conflicting file.
Reconstruct each side's intent from the code, nearby tests, history, commit messages, and linked work items that are available and useful.
Resolve each hunk by preserving compatible intent. Where intents conflict, prefer the merge's stated goal and current repository contracts; avoid inventing unrelated behavior.
Run focused checks for the affected surface, then broader checks when risk or repository guidance warrants them.
Unless the user requested advice or review only, stage resolved files and continue the current merge or rebase when it is safe to do so. Report what was resolved, what was verified, and any remaining uncertainty.

Pause rather than guess when neither intent can be preserved safely. Aborting or restarting can be the correct recovery when the base is wrong, the operation is contaminated, or the user prefers a clean retry; explain the trade-off before taking that destructive step.

Track record

Benchmark

7 / 22

test cases passed with the skill

Adoption

Users: 0
Times used: 0

Safety and source details

SkillSafety

✓ 3 of 3 passed

Code scan15 of 15 checks clean

0 critical · 0 warning · 0 info — scanner v5 — 8/17/2026

View 15 scanner checks

live_secretremote_code_executionreverse_shelldata_exfiltrationssrf_metadataagent_snoopinganti_refusaldestructive_commandsobfuscated_unicodeunicode_homoglyphopaque_blobsuspicious_urltool_overreachtrigger_abuseprompt_injection_phrasing

IntentSafe

LLM judge · does the skill do what it claims

ContentClean

LLM judge · policy & harmful-content review

Source

Imported

stevesolun / ctx

.agents/skills/resolving-merge-conflicts/SKILL.md

View on GitHub ↗

License MITImported 8/17/2026Version v1

Other skills for the same job

Published skills whose descriptions closely match this one, with their headline benchmark lift.

More skills from the same source and nearby in the registry, with their headline benchmark lift.

Ready to supercharge your AI agents?

See it in action

What's inside

Resolve Merge Conflicts

Track record

Benchmark

Adoption

SkillSafety

Source

Other skills for the same job

Related skills