fix-merge-conflicts

Resolve merge conflicts non-interactively and restore a buildable state.

1|Updated Sep 18, 2015

Search Tags:#automation #git #build #conflict-resolution #merge-conflicts #tests #release-ready

Ready to run

npx skills add https://github.com/martindzejky/dotfiles --skill fix-merge-conflicts-martindzejky

💬 Prompt for ChatGPT / Claude Chat▼

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

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Resolve merge conflicts non-interactively, enabling teams to move forward when conflicts block progress and manual resolution is error-prone.

Core Features & Use Cases

Automated conflict resolution with minimal edits that preserve public behavior when feasible.
Validation workflow including regeneration of lockfiles and execution of build, lint, and tests to ensure integrity.
Finalization steps that stage changes and summarize key decisions for review.

Quick Start

Automatically trigger the conflict-resolution workflow to restore a buildable state from a conflicted branch.

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 non-interactively?▼

Automated conflict resolution detects conflicting code and configuration files, applies minimal correct edits to preserve behavior, and regenerates lockfiles to reach a buildable state without manual intervention.

Can I automate conflict resolution and still run my build and tests?▼

Yes, the automated conflict resolution workflow includes a validation phase that regenerates lockfiles and executes build, lint, and tests to verify codebase integrity before staging changes.

What is the best way to handle merge conflicts in multi-branch development workflows?▼

The best way to handle merge conflicts in multi-branch workflows is to apply minimal correct edits, regenerate lockfiles, and run build and tests to ensure a release-ready state while summarizing key decisions for review.

Does automated merge conflict resolution work for configuration files and lockfiles?▼

Yes, automated merge conflict resolution applies to both code and configuration files, and it regenerates lockfiles to ensure dependencies are correct and the project remains in a buildable state.

Why should I use automated conflict resolution instead of manual edits?▼

Automated conflict resolution prevents the errors common in manual resolution by applying minimal correct edits, running validation workflows, and staging changes with a summary of key decisions for safe review.

When should I not use automated merge conflict resolution?▼

Avoid automated merge conflict resolution when conflicts require complex, domain-specific logic that cannot be resolved with minimal edits, as the tool focuses on restoring a buildable state rather than architectural changes.