fix-merge-conflicts

Name: fix-merge-conflicts
Availability: InStock
Author: paulbrittain

Resolve Git merge conflicts by removing markers and validating builds.

Updated May 22, 2026

Search Tags:#git #linting #merge conflicts #tests #CI validation #codebase repair #lockfile regeneration

Ready to run

npx skills add https://github.com/paulbrittain/claude-team-kit --skill fix-merge-conflicts-paulbrittain

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: fix-merge-conflicts
Source: https://github.com/paulbrittain/claude-team-kit/tree/main/skills/fix-merge-conflicts
Command: npx skills add https://github.com/paulbrittain/claude-team-kit --skill fix-merge-conflicts-paulbrittain

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill resolves Git merge conflicts safely so your branch becomes buildable again without leaving messy conflict markers behind.

Core Features & Use Cases

Conflict-aware resolution: Detects all conflicting files and resolves each with minimal, correctness-first edits.
Behavior-preserving choices: Preserves both sides when safe, otherwise selects the variant that is more likely to compile and keep public behavior stable.
Validation and clarity: Regenerates lockfiles via package manager tools, runs compile/lint/tests, stages results, and summarizes key decisions.

Quick Start

Ask the agent to run fix-merge-conflicts to resolve the current branch’s unresolved merge conflicts, regenerate lockfiles, and verify the build and tests pass.

Frequently Asked Questions about fix-merge-conflicts

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

FAQPage Schema

How do I resolve git merge conflicts and get my branch building again?▼

Resolving git merge conflicts requires detecting conflicting files and removing conflict markers with minimal, correctness-first edits. This process brings your branch to a buildable, testable state by preserving both sides when safe or selecting the variant most likely to compile.

What is the best way to fix unresolved merge conflicts after a rebase?▼

Fixing unresolved merge conflicts after a rebase involves applying behavior-preserving choices that keep public behavior stable. This means selecting the variant most likely to compile, regenerating lockfiles via package manager tools, and running compile, lint, and relevant tests for validation.

Does resolving git conflicts manually require running tests and CI validation afterwards?▼

Yes, resolving git conflicts properly requires running tests and CI validation afterwards to ensure the code is buildable. Regenerating lockfiles with package manager tools and running compile, lint, and relevant tests verifies that the resolution choices maintain codebase correctness.

How do I regenerate lockfiles after fixing git conflict markers in my codebase?▼

To regenerate lockfiles after fixing git conflict markers, use package manager tools to rebuild the dependency tree once markers are removed. This ensures dependency consistency before you run compile, lint, and tests to validate the overall codebase repair.

Why does my branch still fail to compile after I remove git conflict markers?▼

Your branch may fail to compile after removing git conflict markers because the selected code variants are incompatible or lockfiles are stale. Correctness-first resolution requires regenerating lockfiles via package manager tools and running compile and lint validation to catch these issues.