🎯

conflict-resolution

🎯Skill

from troykelly/claude-skills

What it does

Handles merge conflicts systematically by resolving conflicts cleanly, verifying resolution, and maintaining code integrity, within a Claude Code plugin for autonomous GitHub-native development.

📦

Same repository

troykelly/claude-skills(54 items)

conflict-resolution

Installation

Vibe Index InstallInstalls to .claude/skills/ - auto-recognized by Claude Code

npx vibeindex add troykelly/claude-skills --skill conflict-resolution

skills.sh Install⚠ Installs to .agents/skills/ - may not be auto-recognized by Claude Code

npx skills add troykelly/claude-skills --skill conflict-resolution

Manual InstallCopy SKILL.md content and save to the path below

~/.claude/skills/conflict-resolution/SKILL.md

SKILL.md

34Installs

Last UpdatedJan 13, 2026

View on GitHub Back to Skills

More from this repository10

🎯

pexels-media🎯Skill

Pexels media integration skill for searching and using free stock photos and videos, from an issue-driven development skills collection.

🎯

database-architecture🎯Skill

A database architecture skill from a Claude Code plugin for autonomous, issue-driven development that works through GitHub issues, creates PRs, and ships code without manual intervention.

🎯

memory-integration🎯Skill

Integrates persistent memory management within a Claude Code plugin for autonomous, GitHub-native software development with 52 skills and 9 agents.

🎯

postgis🎯Skill

A Claude Code plugin for autonomous, GitHub-native software development that works through issues, creates PRs, and ships code with 52 skills and 9 agents.

🎯

comprehensive-review🎯Skill

A Claude Code skill that performs comprehensive 7-criteria code review after implementing features, with mandatory artifact posting to GitHub issues before PR creation.

🎯

autonomous-operation🎯Skill

Skill

🎯

postgres-rls🎯Skill

Skill

🎯

security-review🎯Skill

A Claude Code skill for conducting security reviews, part of an issue-driven development plugin with 52 skills and 9 agents for autonomous development workflows.

🎯

tdd-full-coverage🎯Skill

Skill

🎯

documentation-audit🎯Skill

Skill