merge-conflicts

Detect and resolve Git merge conflicts across single or multiple files.

3|Updated Jan 23, 2026

Search Tags:#git #branching #rebase #conflict-resolution #version-control #merge-conflicts #code-merges

Ready to run

npx skills add https://github.com/lucasilverentand/skills --skill merge-conflicts

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: merge-conflicts
Source: https://github.com/lucasilverentand/skills/tree/main/skills/git/merge-conflicts
Command: npx skills add https://github.com/lucasilverentand/skills --skill merge-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git merge conflicts are a common source of integration headaches, causing stalled work and potential errors if not resolved cleanly.

Core Features & Use Cases

Detect and identify conflicting files during merges or rebases.
Present clear conflict markers and versions (ours vs theirs) to aid decision making.
Provide step-by-step resolution strategies and best practices.
Verify the resolution by testing and re-running the merge or rebase.

Quick Start

Example: merge-conflicts path/to/conflicted-file

Frequently Asked Questions about merge-conflicts

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

FAQPage Schema

How do I resolve Git merge conflicts quickly during a rebase?▼

Git merge conflicts happen when competing changes are merged into the same file. Conflict markers visually separate the versions, allowing you to manually edit the code, choose the correct lines, and finalize the integration cleanly.

What's the best way to identify which files have Git merge conflicts?▼

The best way to identify files with Git merge conflicts is using common Git commands and shell scripts to display conflict markers. This skill automatically detects and lists the conflicting files across single or multiple files in any language.

Can I use this to fix version-control conflicts across multiple files?▼

Yes, you can use this to fix version-control conflicts across multiple files. It applies to standard development workflows during merges and rebases, handling conflict resolution across single or multiple files regardless of the programming language.

How do I verify a conflict resolution is correct before finalizing the merge?▼

To verify a conflict resolution is correct, you should test the code and re-run the merge or rebase. This skill provides step-by-step resolution strategies and best practices to ensure the final integration is clean and error-free.

Why do Git conflict markers show ours and theirs versions in the code?▼

Git conflict markers show ours and theirs versions to aid decision making during integration. The ours version represents your current branch changes, while theirs represents the incoming branch changes, helping you understand and manually resolve the differences.