Git merge conflicts - resolve without losing intent.
NewMaintained
Automatic
◆Coding pack
Last verified 8/14/2026
What it changes
Passed 4 of 11 test cases with the skill, and 4 of 11 without it.
Without skill36%
With skill32%
Checks it passed that the model alone missed
Marks the resolution task as failed
Reports task failure due to unresolvable schema migration conflict
Provides a clear explanation regarding the semantic ambiguity of the auth token function
2 fixed5 passed either way12 still failing3 broke
Pass-rate lift
-5 pp
Tokens
+5%
Agent turns
0%
Response time
-9%
Model gemini-3.6-flashMeasured 8/14/2026v17 of 22 cases passed with skill · 11 comparable
Tokens, turns and time describe resource use, not a dollar price.
See it in action
One of 2 test cases the skill fixed. Same model, same prompt, with and without the skill.
1 of 2
Prompt
In `db/migrations/004_update.sql`, Branch A drops table `user_logs` to replace it with `activity_events`. Branch B alters table `user_logs` adding three foreign keys. The intended schema design is conflicting and ambiguous.
What was checked, without and with the skill
Checked
Without skill
With skill
Reports task failure due to unresolvable schema migration conflict
Missed
Passed
case-14 · gemini-3.6-flash · 8/14/2026 · answers are capped and redacted
What's inside
The instructions your model reads when the skill loads.
SKILL.md27 linessingle file
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
Read the conflict markers and surrounding context for each file.
Understand what each side was trying to accomplish.
Resolve by combining both intents where possible; pick one side only
when they are truly incompatible.
After resolving all conflicts, run any available tests to verify.
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.