SkillClaude CodeCursorClineOpenClawWindsurfVS CodeChatGPT
resolve-merge-conflicts
resolve-merge-conflicts — a Claude Code skill from warpdotdev/common-skills
Features
- ✓Curated collection of shared agent skills
- ✓Reusable workflows for cross-repository use
- ✓Structured SKILL.md files with YAML frontmatter
- ✓Optional helper scripts and supporting documents
- ✓Guidance for skill authoring and maintenance
- ✓Visit [GitHub repo](https://github.com/warpdotdev/common-skills) for more details
Installation Guide
This is a curated collection of shared agent skills. To find individual tools, browse the GitHub repository. Each skill has its own directory with its own install instructions.