conflict-resolution
๐ฏSkillfrom troykelly/claude-skills
|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)
Installation
npx vibeindex add troykelly/claude-skills --skill conflict-resolutionnpx skills add troykelly/claude-skills --skill conflict-resolution~/.claude/skills/conflict-resolution/SKILL.mdSKILL.md
More from this repository10
Pexels media integration skill for searching and using free stock photos and videos, from an issue-driven development skills collection.
Use when documentation drift is detected. Comprehensively audits codebase and creates/updates Swagger, features docs, and general documentation to achieve full sync.
Integrates persistent memory management within a Claude Code plugin for autonomous, GitHub-native software development with 52 skills and 9 agents.
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.
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.
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.
A Claude Code skill that performs comprehensive 7-criteria code review after implementing features, with mandatory artifact posting to GitHub issues before PR creation.
Skill
Skill