Automated summary
This skill guides the resolution of git conflicts (content, structural, dependency) as well as arbitration between contradictory recommendations from multiple agents.
Strengths
- Separates three git conflict types (content, structural, dependency) with an analysis approach for each
- Provides ready-to-use essential git commands (status, diff, checkout --ours/--theirs, add, commit)
- Offers a structured method for comparing agent assessments: points of agreement, disagreements, confidence levels
- Includes a decision-documentation step so resolutions are recorded and can inform future work
Limitations
- Agent arbitration rules rely on arbitrary weights (Cursor 0.8 for security, Gemini 0.7 for architecture) with no justification
- Does not cover advanced cases such as interactive rebase, cherry-pick, or submodule conflicts
- Remains a manual procedure: no automation or post-resolution verification (tests, build) is included
Use it when a merge produces git conflicts, or when multiple agents return incompatible recommendations that need reconciling.
Avoid it if you need automated conflict resolution, or if the disagreement falls outside the domains covered by the provided weighting rules.
Security analysis
SafeThe skill only provides guidance and standard git commands for resolving conflicts. It does not instruct destructive actions, exfiltration, obfuscation, or safety-disabling behavior. The included bash commands are ordinary git workflow commands.
No concerns found
How this analysis is madeExamples
I merged main into my feature branch and got conflicts in src/auth/session.ts. Can you help me figure out whether it's a content or structural conflict, analyze both sides, and resolve it properly?Cursor says our token handling has a security flaw, but Gemini says the current architecture is fine. Compare their assessments and tell me which one to follow.We just resolved a dependency version conflict by keeping the newer package.json entry. Record the decision and the reason so we can reference it later.name: resolve-conflict tags: technology: [git] feature: [workflow] priority: medium summary: Resolve git conflicts and disagreements between agents version: 1
Resolve Conflict
When to use
- Git merge conflicts occur
- Agents have conflicting recommendations
- Multiple approaches need reconciliation
Instructions
Git Conflicts
-
Identify the conflict type:
- Content conflict (same lines modified)
- Structural conflict (file moved/deleted)
- Dependency conflict (version mismatch)
-
Analyze both sides:
- Understand intent of each change
- Check which is more recent
- Verify which aligns with requirements
-
Resolve appropriately:
- Keep the correct version
- Merge changes if both needed
- Document the resolution
Agent Disagreements
-
Compare assessments:
- List points of agreement
- Identify specific disagreements
- Check confidence levels
-
Apply resolution rules:
- Security issues: Cursor preferred (0.8 weight)
- Architecture issues: Gemini preferred (0.7 weight)
- Equal weight: Escalate to human
-
Document decision:
- Record which assessment won
- Note the reason
- Save for future learning
Resolution Commands
# See conflicts
git status
# View conflict markers
git diff
# Accept current (ours)
git checkout --ours <file>
# Accept incoming (theirs)
git checkout --theirs <file>
# Manual resolution then:
git add <file>
git commit
From the file to a first result
The download contains exactly the content displayed on this page. This copy may differ from the latest version in the source repository.
View the source and supporting filesThis download contains SKILL.md only. Any scripts, references, templates and dependencies are not included. Get the required files from the source, preserving their directory structure, before continuing.
1. Download the file
Download SKILL.mdFrom the root of a test project, save the file as .skill-downloads/conflict-resolution-mrzxuqyp/SKILL.md, or use the command below. This folder is for inspecting the skill before installation.
Command for macOS/Linux or WSL: requires a POSIX shell and curl. On Windows without WSL, use the download button and create the folder manually.
mkdir -p '.skill-downloads/conflict-resolution-mrzxuqyp' && curl --fail --show-error --location 'https://skills-guides.com/api/skills/conflict-resolution-mrzxuqyp/download' --output '.skill-downloads/conflict-resolution-mrzxuqyp/SKILL.md.part' && mv '.skill-downloads/conflict-resolution-mrzxuqyp/SKILL.md.part' '.skill-downloads/conflict-resolution-mrzxuqyp/SKILL.md'2. Check prerequisites
Read SKILL.md before using it. If it references scripts or external services, inspect them and prepare the required access in your test environment.
No recognized prerequisites section in this file. This does not mean it is self-contained: libraries, tools and access requirements may be mentioned elsewhere in the content or source repository.
The platforms on this page are catalog indications. The paths below follow tool documentation; they do not prove this skill has been run in those tools. No minimum tool version is confirmed for this listing.
3. Load the skill
This file does not provide a usable name/description header for this native procedure. It remains available to download and inspect; use the manual method below.
Manual method or another tool: attach SKILL.md to a conversation, or open it in an agent that can read files. Include any required supporting resources. No universal folder is recognized by every tool.
4. Try a first task
Use a short, synthetic input: an API endpoint, a small document or an interface brief. In a new conversation, attach the file or give the agent its path, then adapt this request:
Read .skill-downloads/conflict-resolution-mrzxuqyp/SKILL.md and apply its instructions to this example: [describe a test input]. Identify any missing files, dependencies or access. Produce the result requested by the skill without inventing data or running unreviewed scripts.Expected result: output matching the skill instructions, or a precise list of missing prerequisites. A read confirmation alone does not validate a first use. If an external resource is unavailable, that path remains untested.
React Hook Form Best Practices
Development
Master React Hook Form: avoid anti-patterns, manage subscriptions, and handle reset, dirty state, and controlled inputs correctly.
Emotion to Mantine Migration
Development
Migrate Emotion styled-components to Mantine components with style props and CSS modules. Use when converting .styled.tsx files or removing @emotion imports.
Scope Creep Detector
Development
Analyzes git diffs against a stated intent to detect scope creep, unrelated files, broad PRs, and oversized changes, then suggests keep, split, or justify actions.