skills.rest
Terry-Mao
Terry-MaoCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

resolve-merge-conflicts

Analyze Git conflict hunks and generate concise diffs for unresolved paths.

144|16|Updated May 3, 2026
Search Tags:#git#version control#merge conflicts#diffs#code resolution
One-click install
npx skills add https://github.com/Terry-Mao/AICodingFlow --skill resolve-merge-conflicts-terry-mao
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-merge-conflicts
Source: https://github.com/Terry-Mao/AICodingFlow/tree/main/.agents/skills/resolve-merge-conflicts
Command: npx skills add https://github.com/Terry-Mao/AICodingFlow --skill resolve-merge-conflicts-terry-mao

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill simplifies the process of resolving Git merge conflicts by focusing on unresolved paths, conflict hunks, and compact diffs, reducing the need to load entire files into context.

Core Features & Use Cases

  • Selective Conflict Resolution: Offers a detailed yet concise view of each conflict hunk, allowing developers to address only the parts of files that have issues.
  • Efficient Workflow: Enables quick summary inspection, followed by focused resolution of individual files.
  • Use Case: Ideal for developers encountering merge conflicts during integration of feature branches, especially in projects with many contributors or complex code structures.

Quick Start

To start resolving merge conflicts in your current branch, run the command: python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py

Frequently Asked Questions about resolve-merge-conflicts

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

FAQPage Schema
How do I resolve Git merge conflicts without loading entire files into context?▼

To resolve Git merge conflicts efficiently, this Skill analyzes unresolved paths and conflict hunks to generate concise diffs, minimizing file handling. It extracts only the conflicting sections, allowing developers to address discrepancies directly without loading full files.

What is the best way to inspect conflict hunks during feature branch integration?▼

Inspecting conflict hunks during feature branch integration is best handled by extracting concise diffs of the unresolved paths. This allows for a quick summary inspection followed by focused resolution of individual file-level merge discrepancies.

Can I use this merge conflict resolution approach for projects with complex code structures?▼

Yes, you can use this approach for projects with complex code structures. It offers selective conflict resolution by providing a detailed yet concise view of each conflict hunk, which is ideal for complex projects with many contributors.

How do I start resolving file-level merge discrepancies in my current branch?▼

To start resolving file-level merge discrepancies in your current branch, run the extraction script via command line. This initiates the analysis of unresolved paths to generate the concise diffs needed for conflict resolution.

Why does resolving Git merge conflicts manually slow down developer workflow?▼

Resolving Git merge conflicts manually slows down developer workflow by requiring entire files to be loaded into context for review. This Skill enhances efficiency by focusing strictly on compact diffs and conflict hunks to reduce file handling overhead.

Related Skills

Explore More Software Engineering Skills→
warpdotdevwarpdotdev
64.1k

resolve-merge-conflicts

Extract unresolved conflict hunks and per-file diffs from Git operations.

Official
Intermediate
terzigoluterzigolu
37

resolve-merge-conflicts

Summarize Git merge conflicts with unresolved paths, hunks, and compact diffs.

Community
Advanced
mkusakamkusaka
7

code-review-low-effort-expanded-findings-mode

Process a unified diff and return up to eight high-priority findings per hunk.

Community
Intermediate
ahoymahoym
2

git-preview-conflicts

Identify conflicting files between Git branches without executing a merge.

Community
Intermediate