merge-conflicts

Resolve Git merge conflicts file-by-file with staged incremental edits.

Updated Apr 11, 2026

Search Tags:#git #code review #version control #pnpm #merge conflicts #rebase

Ready to run

npx skills add https://github.com/BrunoAlpezdev/lluvia-de-ideas --skill merge-conflicts-brunoalpezdev

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: merge-conflicts
Source: https://github.com/BrunoAlpezdev/lluvia-de-ideas/tree/main/.claude/skills/merge-conflicts
Command: npx skills add https://github.com/BrunoAlpezdev/lluvia-de-ideas --skill merge-conflicts-brunoalpezdev

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps you safely resolve complex Git merge conflicts while preserving your changes and preventing accidental data loss or broken code.

Core Features & Use Cases

Conflict inventory and prioritization: Identifies all unmerged paths and processes them file-by-file.
Conflict classification: Categorizes each conflict as Trivial, One-side, Combinable, or Semantic to choose the right resolution strategy.
Safe resolution workflow: Resolves incrementally with immediate staging, includes special handling for lock files, generated code, and Supabase migrations, and verifies that conflict markers are gone before building.

Quick Start

Use the merge-conflicts skill to resolve your current Git merge or rebase conflicts incrementally, staging each file immediately after you apply the correct resolution approach.

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 without losing my code changes?▼

To resolve git merge conflicts without losing work, you must list unmerged paths, classify each conflict as Trivial, One-side, Combinable, or Semantic, and apply the matching resolution strategy file-by-file. This ensures both sides of the merge are evaluated before staging.

What is the best way to handle merge conflicts in lock files and generated code?▼

The best way to handle merge conflicts in lock files and generated code is through special-case handling during your incremental resolution workflow. You categorize these specific file types separately to prevent broken dependencies or overwritten generated outputs.

How do I safely eliminate conflict markers during a git rebase?▼

To safely eliminate conflict markers during a git rebase, resolve conflicts incrementally and stage each file immediately with git add. You must verify the complete absence of marker strings across source files before proceeding with the build.

Why should I classify conflict types before staging files in version control?▼

Classifying conflict types before staging in version control dictates your resolution strategy and prevents accidental data loss. By sorting conflicts into Trivial, One-side, Combinable, or Semantic categories, you apply the correct safe edits for each specific scenario.

Do I need to run pnpm build after resolving all git conflicts?▼

Yes, you need to run pnpm build after resolving all git conflicts to verify the integrity of your code. Running the build confirms that conflict markers are completely gone and that your safe edits did not break the project compilation.

Can I use this incremental conflict resolution workflow for Supabase migrations?▼

Yes, you can use this incremental conflict resolution workflow for Supabase migrations because it includes special handling for these files. The process ensures migration conflicts are categorized and resolved safely alongside your standard source code.