mcpbeat

Resolving Merge Conflicts

aiskillstore/resolving-merge-conflicts

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

This is a copy. The original lives at google/resolving-merge-conflicts.

3k tokens
context cost
the whole folder, loaded on every use
2
files
instructions only
0
copies elsewhere
how many repositories repackaged it
404
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/aiskillstore/marketplace --skill resolving-merge-conflicts

How to use it

Copy the folder

Take aiskillstore/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.