skills.rest
cogine-ai
cogine-aiOFFICIAL
Explore all skills by this author →
WebsiteGitHub

fix-merge-conflicts

Resolve git merge conflicts non-interactively and validate the resulting build.

3|1|Updated Mar 17, 2026
Search Tags:#automation#git#build#conflict-resolution#ci#merge-conflicts#tests
One-click install
npx skills add https://github.com/cogine-ai/cogine-dev-skillset --skill fix-merge-conflicts-cogine-ai
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: fix-merge-conflicts
Source: https://github.com/cogine-ai/cogine-dev-skillset/tree/main/skills/fix-merge-conflicts
Command: npx skills add https://github.com/cogine-ai/cogine-dev-skillset --skill fix-merge-conflicts-cogine-ai

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill eliminates the tedious, error-prone process of manually resolving Git merge conflicts and reconstructing a build-ready state, saving time and reducing human error.

Core Features & Use Cases

  • Deterministic, non-interactive conflict resolution that preserves stable behavior where possible.
  • Validation of the resulting codebase by running build, lint, and tests, and reporting outcomes to CI pipelines.
  • Use Case: When a feature branch and main branch have diverged with conflicting sections, this skill automatically resolves conflicts while keeping public behavior intact and ensuring a green build.

Quick Start

Run the merge-conflicts skill on a repository with unresolved markers to produce a build-ready state without manual edits.

Frequently Asked Questions about fix-merge-conflicts

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

FAQPage Schema
How do I automatically resolve git merge conflicts without manual intervention?▼

Automated merge conflict resolution applies deterministic logic to unresolved git markers, updating lockfiles and validating builds without manual edits. It reconstructs a build-ready state by preserving stable behavior and reporting outcomes to CI pipelines.

Can I resolve merge conflicts and still keep my CI build green?▼

Yes, merge conflict resolution validates the resulting codebase by running build, lint, and tests to ensure a green CI build. It automatically resolves conflicting sections while keeping public behavior intact and reports final outcomes to your pipeline.

Does automated conflict resolution work across different programming languages?▼

Deterministic conflict resolution applies to collaborative software projects with unresolved merge markers across multiple languages. It updates lockfiles, runs compile and lint, and produces a build-ready state regardless of the project's language.

What is the best way to handle diverged feature and main branches with conflicting sections?▼

The best approach is deterministic, non-interactive conflict resolution that preserves stable behavior where possible. It automatically resolves conflicts between diverged branches, updates lockfiles, and runs compile and lint to produce a build-ready state.

Are there limitations to non-interactive merge conflict resolution?▼

Non-interactive conflict resolution relies on deterministic logic, meaning it may not handle complex semantic conflicts requiring human judgment. It preserves stable behavior where possible but validates outcomes by running build, lint, and tests to catch any unresolved issues.

Do I need a specific CI workflow to automate git conflict resolution?▼

You need CI workflows that require passing builds and tests after conflict resolution. The skill integrates with these pipelines by running compile and lint, updating lockfiles, and reporting final outcomes directly to your existing CI setup.

Related Skills

Explore More Software Engineering Skills→
twikustwikus
3

merge

Merge Git branches with context-aware conflict resolution using GitHub CLI.

Community
Intermediate
mahg-esmahg-es
3

cicd-pipeline

Generate CI/CD pipelines with lint, build, test, and deploy stages.

Official
Advanced
nthpaulnthpaul

fix-merge-conflicts

Resolves git merge conflicts and validates builds with compile, lint, and tests.

Community
Intermediate
cursorcursor
2.6k

fix-merge-conflicts

Resolve Git merge conflicts and validate builds with tests.

Official
Intermediate