T3 VERIFIED

majiayu000/claude-skill-registry/conflict-resolution

majiayu000·Coding·majiayu000/claude-skill-registry·skills/other/conflict-resolution/SKILL.md ↗·Updated Apr 1, 2026

Source check pending

This skill was recently updated. Verifying source availability...

majiayu000/claude-skill-registry

community

Install

# npm
$ npx vskill@latest install majiayu000/claude-skill-registry/conflict-resolution

# bun
$ bunx vskill@latest install majiayu000/claude-skill-registry/conflict-resolution

# pnpm
$ pnpx vskill@latest install majiayu000/claude-skill-registry/conflict-resolution

# yarn
$ yarn dlx vskill@latest install majiayu000/claude-skill-registry/conflict-resolution

# alternative
$ npx vskill@latest install majiayu000/claude-skill-registry --skill conflict-resolution

──Security

Tier 1PASS 95/100Tier 2PASSView full security report →

──Quality Evaluation

No evaluation data available yetView eval results →

Popularity

169stars32forks267d trend

119d ago

Works with

Works with all 39 vskill-compatible agents

Claude Code

Cursor

GitHub Copilot

Windsurf

Codex

Gemini CLI

ClineAmp

Embed badge

Markdown

[![vskill VERIFIED](https://verified-skill.com/api/v1/skills/majiayu000/claude-skill-registry/conflict-resolution/badge)](https://verified-skill.com/skills/majiayu000/claude-skill-registry/conflict-resolution)