SKILL·DCAD52

conflict-resolve

majiayu000
Updated 2 months ago
111 views
58
9
58
View on GitHub
Testingdesign

About

This Claude Skill provides guided merge conflict resolution with semantic analysis to recommend strategies (ours/theirs/manual) and display side-by-side diffs. It optimizes performance through conflict state caching and integrates with testing workflows for validation. Use it when you need intelligent assistance resolving Git conflicts during merges or rebases.

Quick Install

Claude Code

Recommended
Primary
npx skills add majiayu000/claude-skill-registry -a claude-code
Plugin CommandAlternative
/plugin add https://github.com/majiayu000/claude-skill-registry
Git CloneAlternative
git clone https://github.com/majiayu000/claude-skill-registry.git ~/.claude/skills/conflict-resolve

Copy and paste this command in Claude Code to install this skill

GitHub Repository

majiayu000/claude-skill-registry
Path: skills/conflict-resolve
0
FAQ

Frequently asked questions

What is the conflict-resolve skill?

conflict-resolve is a Claude Skill by majiayu000. Skills package instructions and resources that Claude loads on demand, so Claude can perform conflict-resolve-related tasks without extra prompting.

How do I install conflict-resolve?

Use the install commands on this page: add conflict-resolve to Claude Code as a plugin, or clone its repository into your skills directory, then restart Claude so it picks up the skill.

What category does conflict-resolve belong to?

conflict-resolve is in the Testing category, tagged design.

Is conflict-resolve free to use?

Yes. conflict-resolve is listed on AIMCP and free to install. It runs inside Claude, so no separate service account is required to use the skill itself.

Related Skills

evaluating-llms-harness
Testing

This Claude Skill runs the lm-evaluation-harness to benchmark LLMs across 60+ standardized academic tasks like MMLU and GSM8K. It's designed for developers to compare model quality, track training progress, or report academic results. The tool supports various backends including HuggingFace and vLLM models.

View skill
cloudflare-cron-triggers
Testing

This skill provides comprehensive knowledge for implementing Cloudflare Cron Triggers to schedule Workers using cron expressions. It covers setting up periodic tasks, maintenance jobs, and automated workflows while handling common issues like invalid cron expressions and timezone problems. Developers can use it for configuring scheduled handlers, testing cron triggers, and integrating with Workflows and Green Compute.

View skill
webapp-testing
Testing

This Claude Skill provides a Playwright-based toolkit for testing local web applications through Python scripts. It enables frontend verification, UI debugging, screenshot capture, and log viewing while managing server lifecycles. Use it for browser automation tasks but run scripts directly rather than reading their source code to avoid context pollution.

View skill
finishing-a-development-branch
Testing

This skill helps developers complete finished work by verifying tests pass and then presenting structured integration options. It guides the workflow for merging, creating PRs, or cleaning up branches after implementation is done. Use it when your code is ready and tested to systematically finalize the development process.

View skill