Resolving Merge Conflicts Agent Skill

Use when you need to resolve an in-progress git merge/rebase conflict.

283 tokens

context cost

the whole folder, loaded on every use

files

instructions only

copies elsewhere

how many repositories repackaged it

104

stars on the repo

on the repository, not the skill itself

Install

one command, takes just this skill from the repository

npx skills add https://github.com/tt-a1i/matt-skills-with-to-goal --skill resolving-merge-conflicts

113 bytes besides the instruction

agents/openai.yaml

as written by the author

See the current state of the merge/rebase. Check git history, and the conflicting files.

Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.

Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Default to resolving; reach for --abort only when the two intents are irreconcilable and the right fix is restructuring the change.

Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.

Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

Copy the folder

Take tt-a1i/resolving-merge-conflicts from the repository into ~/.claude/skills for personal use, or into .claude/skills inside a project.

Check the name does not clash

The agent identifies a skill by the name field in its header. Two skills with the same name cannot sit side by side — one of them will be ignored.