T2 SCANNED

majiayu000/claude-skill-registry/fix-merge-conflicts

majiayu000·Coding·majiayu000/claude-skill-registry·skills/development/fix-merge-conflicts/SKILL.md ↗·Updated May 10, 2026

majiayu000/claude-skill-registry

community

Install

# npm
$ npx vskill@latest install majiayu000/claude-skill-registry/fix-merge-conflicts

# bun
$ bunx vskill@latest install majiayu000/claude-skill-registry/fix-merge-conflicts

# pnpm
$ pnpx vskill@latest install majiayu000/claude-skill-registry/fix-merge-conflicts

# yarn
$ yarn dlx vskill@latest install majiayu000/claude-skill-registry/fix-merge-conflicts

# alternative
$ npx vskill@latest install majiayu000/claude-skill-registry --skill fix-merge-conflicts

──Security

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

──Quality Evaluation

No evaluation data available yetView eval results →

Popularity

290stars51forks1007d trend

1h 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/fix-merge-conflicts/badge)](https://verified-skill.com/skills/majiayu000/claude-skill-registry/fix-merge-conflicts)