skills.rest
nielsmadan
nielsmadanCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

resolve-conflicts

Identify conflicted files and provide Git commands to resolve them.

1|Updated Jan 18, 2026
Search Tags:#git#developer tools#merge#rebase#resolution#conflicts
One-click install
npx skills add https://github.com/nielsmadan/agentic-coding --skill resolve-conflicts-nielsmadan
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-conflicts
Source: https://github.com/nielsmadan/agentic-coding/tree/main/claude/skills/resolve-conflicts
Command: npx skills add https://github.com/nielsmadan/agentic-coding --skill resolve-conflicts-nielsmadan

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill helps you navigate and resolve Git merge, rebase, cherry-pick, and revert conflicts, ensuring a smooth continuation of your development workflow.

Core Features & Use Cases

  • Conflict Detection: Automatically identifies the type of Git operation causing conflicts (merge, rebase, etc.).
  • File Identification: Lists all files with active conflicts.
  • Resolution Guidance: Provides clear, step-by-step instructions for resolving conflicts, including specific commands for continuing or aborting operations.
  • Use Case: When a git merge results in conflicted files, you can use this Skill to understand the conflict markers, decide on the correct code, and get the exact commands to git add the resolved files and git commit to finalize the merge.

Quick Start

Use the resolve-conflicts skill to help resolve any git conflicts in the current repository.

Frequently Asked Questions about resolve-conflicts

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I resolve Git merge conflicts when a pull request fails?▼

To resolve Git merge conflicts, you must identify the conflicted files, analyze the conflict markers to decide between ours and theirs, and use precise git add and git commit commands to finalize the resolution.

What is the best way to fix conflicts during a Git rebase?▼

Fixing Git rebase conflicts requires analyzing the conflict markers in the affected files, resolving the code differences, and running the specific commands provided to continue or abort the rebase workflow.

How do I handle lock file conflicts and auto-generated files in Git merges?▼

Handling lock file conflicts and auto-generated files in Git merges involves identifying these common conflict patterns and applying targeted resolution commands to overwrite the markers and continue the workflow.

Can I get exact commands to abort or continue a conflicted cherry-pick?▼

Yes, you can get exact commands to abort or continue a conflicted cherry-pick by identifying the active Git operation and following the precise step-by-step guidance to resolve markers and finalize the pick.

Why does Git show ours and theirs markers in my files?▼

Git shows ours and theirs conflict markers because a merge, rebase, cherry-pick, or revert operation encountered overlapping code changes, requiring you to analyze the differences and manually resolve the conflicts.

Related Skills

Explore More Software Engineering Skills→
deepklaritydeepklarity
87

dk-merge-resolve

Diagnose git merge, rebase, cherry-pick, or stash pop conflicts and guide resolution.

Official
Advanced
mhattingpetemhattingpete
657

git-pushing

Stage, commit, and push code changes with conventional commit messages.

Community
Basic
DataDogDataDog
648

compare-cpython-versions

Compares two CPython versions' headers and structs to identify breaking changes and API modifications.

Official
Advanced
chlmmchlmm

cmd

Execute Windows CMD file operations, system management, and network troubleshooting via scripts.

Community
Intermediate