merge-conflict

Identify and resolve merge conflict markers across multi-language codebases.

11|Updated Apr 16, 2026

Search Tags:#automation #git #scripting #conflict-resolution #code-review #merge-conflict

Ready to run

npx skills add https://github.com/berkcangumusisik/claude-code-practices --skill merge-conflict

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: merge-conflict
Source: https://github.com/berkcangumusisik/claude-code-practices/tree/main/skills/merge-conflict
Command: npx skills add https://github.com/berkcangumusisik/claude-code-practices --skill merge-conflict

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps developers identify and resolve merge conflict markers across a repository, providing clear explanations of each conflict and suggested resolutions to streamline collaboration.

Core Features & Use Cases

Conflict detection: Find all files containing conflict markers (<<<<<, =======, >>>>>>>) and list conflicting blocks.
Rationale and resolution: For each block, explain what HEAD and theirs are trying to do and propose resolved code with justification.
Automation-ready: After confirmation, apply the proposed resolutions and stage changes for commit.

Quick Start

Review the repo to locate merge conflicts, then provide a resolution for each block and apply after user confirmation.

Frequently Asked Questions about merge-conflict

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

FAQPage Schema

How do I resolve git merge conflict markers across multiple files?▼

To resolve git merge conflict markers, this Skill scans your codebase for <<<<<<<, =======, and >>>>>>> patterns, explains the HEAD and theirs differences for each block, and proposes a concrete resolution to apply after confirmation.

What is the best way to automatically explain and fix code merge conflicts?▼

The best way to automatically handle code merge conflicts is to use a scripting Skill that reads conflicting blocks, explains the rationale behind each side, and proposes resolved code to streamline collaboration.

Can I automate conflict resolution across a multi-language codebase?▼

Yes, you can automate conflict resolution across a multi-language codebase because this Skill works across different project languages, detecting conflict markers and proposing resolutions regardless of the file type.

How do I ensure my codebase passes tests after resolving merge conflicts?▼

To ensure your codebase passes tests after resolving merge conflicts, this Skill applies proposed resolutions, stages changes for commit, and verifies that tests pass before finalizing the updated files.

Does this merge conflict resolution tool apply changes automatically?▼

This merge conflict resolution tool applies changes only after user confirmation, writing updated file versions and staging them for commit to prevent unintended code modifications.

Why should I use an automated script for git conflict resolution instead of manual editing?▼

You should use an automated script for git conflict resolution because it documents the rationale behind each proposed change, streamlining code review and reducing human error across multiple files.