T2 SCANNEDLLM review pending

featherhunter/dsh-mattpocock-skills-deck/resolving-merge-conflicts

Name: resolving-merge-conflicts
Author: featherhunter

featherhunter·Coding·featherhunter/dsh-mattpocock-skills-deck·package/bundled-skills/resolving-merge-conflicts/SKILL.md ↗·Updated Oct 5, 2026

Source check pending

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

featherhunter/dsh-mattpocock-skills-deck

community

Install

# npm
$ npx vskill@latest install featherhunter/dsh-mattpocock-skills-deck/resolving-merge-conflicts

# bun
$ bunx vskill@latest install featherhunter/dsh-mattpocock-skills-deck/resolving-merge-conflicts

# pnpm
$ pnpx vskill@latest install featherhunter/dsh-mattpocock-skills-deck/resolving-merge-conflicts

# yarn
$ yarn dlx vskill@latest install featherhunter/dsh-mattpocock-skills-deck/resolving-merge-conflicts

# alternative
$ npx vskill@latest install featherhunter/dsh-mattpocock-skills-deck --skill resolving-merge-conflicts

──Security

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

──Quality Evaluation

No evaluation data available yetView eval results →

Popularity

57d trend

Works with

Works with all 39 vskill-compatible agents

Claude Code

Cursor

GitHub Copilot

Windsurf

Codex

Gemini CLI

Cline

Amp

Roo Code

Goose

Continue

Kilo Code

Junie

Trae

OpenHands

Qwen CodeAI AgentTabnine ChatSourcegraph CodyAmazon QFirebase GenkitSweepDevinPhindMentatClaude DesktopAiderGPT PilotPlandexbolt.newv0

Replit AgentAnseTypingMindBetterChatGPTLibreChatWarp AIPiecesFig AI

Embed badge

Markdown

[![vskill VERIFIED](https://verified-skill.com/api/v1/skills/featherhunter/dsh-mattpocock-skills-deck/resolving-merge-conflicts/badge)](https://verified-skill.com/skills/featherhunter/dsh-mattpocock-skills-deck/resolving-merge-conflicts)