skills.rest
mikanfactory
mikanfactoryCOMMUNITY
Explore all skills by this author →
GitHub

resolve-conflicts

Analyze and resolve Git merge conflicts by staging changes without committing.

Updated Jan 6, 2026
Search Tags:#git#developer tools#debugging#version control#merge conflicts#conflict resolution
One-click install
npx skills add https://github.com/mikanfactory/dotfiles --skill resolve-conflicts-mikanfactory
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-conflicts
Source: https://github.com/mikanfactory/dotfiles/tree/main/home/dot_claude/skills/resolve-conflicts
Command: npx skills add https://github.com/mikanfactory/dotfiles --skill resolve-conflicts-mikanfactory

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill helps you analyze and safely resolve Git merge conflicts, preventing accidental data loss or incorrect merges.

Core Features & Use Cases

  • Conflict Analysis: Identifies all files with merge conflicts and provides a clear overview of the current Git status.
  • Guided Resolution: Leverages a specialized conflict-resolver agent to suggest resolution strategies for each conflicted file.
  • Staging, Not Committing: Resolves conflicts and stages the changes, but crucially, does not commit them, allowing for user review before finalization.
  • Use Case: When a git merge operation results in conflicts, this Skill will guide you through understanding and fixing them without the risk of premature commits.

Quick Start

Use the resolve-conflicts skill to analyze and resolve any current Git merge conflicts.

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 safely?▼

To resolve Git merge conflicts safely, this Skill identifies conflicted files and applies suggested resolutions. It stages the corrected changes without committing them, allowing you to review the final result before finalizing the merge.

What is the best way to fix conflicted files after a Git merge?▼

Fixing conflicted files after a Git merge involves analyzing the current Git status and diff. This Skill uses a specialized agent to suggest resolution strategies for each file, then stages the changes without committing.

Does this conflict resolution tool commit changes automatically?▼

No, this conflict resolution tool does not commit changes automatically. It resolves the merge conflicts and stages the changes in Git, ensuring you retain full control to review and manually commit the final result.

Can I use this to resolve conflicts during a Git rebase?▼

Yes, you can use this to resolve conflicts during a Git rebase. It supports standard Git operations including branching, merging, rebasing, adding, and checking out files to guide you through the resolution process safely.

Why does my Git merge result in conflicts that need staging?▼

Git merge conflicts happen when competing changes occur in the same file. This Skill identifies all conflicted files, applies resolution strategies, and stages the changes without committing so you can verify the merge outcome.

Related Skills

Explore More Software Engineering Skills→
MilesChouMilesChou
1

Resolving-Conflict

Resolve Git conflicts during rebase or merge operations.

Community
Basic
tobihagemanntobihagemann
399

commit-staged-push

Commit staged changes and push them to the current branch's remote.

Community
Basic
curiositechcuriositech
181

git-workflow-expert

Guide Git branching strategies, merge conflict resolution, and advanced operations.

Official
Advanced
FutureAtomsFutureAtoms
1

git-github-conflict-resolve

Guide Git merge conflict resolution with Git and gh commands.

Community
Intermediate