skills.rest
fjpulidop
fjpulidopCOMMUNITY
Explore all skills by this author →
GitHub

merge-resolve

Resolve git merge conflicts in working tree files using OpenSpec context bundles.

9|2|Updated Mar 12, 2026
Search Tags:#git#ai#merge#openspec#conflicts#resolver
One-click install
npx skills add https://github.com/fjpulidop/specrails-core --skill merge-resolve-fjpulidop
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge-resolve
Source: https://github.com/fjpulidop/specrails-core/tree/main/specrails-plugin/skills/merge-resolve
Command: npx skills add https://github.com/fjpulidop/specrails-core --skill merge-resolve-fjpulidop

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Resolve git merge conflicts in working tree files using AI-powered context analysis to infer correct resolutions and write them in place or preserve markers when uncertain.

Core Features & Use Cases

  • AI-powered conflict resolution for git merge markers in working trees.
  • Reads OpenSpec context bundles to infer resolutions and write changes in place, or preserve markers when confidence is low.
  • Supports integration via the sr-merge-resolver agent to provide auditable merge resolutions.

Quick Start

Run the sr-merge-resolver agent to automatically resolve merge conflicts with AI-driven context inference in your repository.

Frequently Asked Questions about merge-resolve

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

FAQPage Schema
How do I resolve git merge conflicts using AI context analysis?▼

Resolve git merge conflicts by running the sr-merge-resolver agent, which analyzes working tree files and OpenSpec context bundles to infer correct resolutions. The agent writes changes in place or preserves markers when confidence is low.

What is the best way to handle uncertain git merge conflict resolutions?▼

Handling uncertain git merge conflicts is managed by configuring a confidence threshold. When AI confidence is low, the resolver preserves original conflict markers in the working tree files instead of writing incorrect changes.

Can I resolve merge conflicts for specific files in my repository?▼

Yes, you can resolve merge conflicts for specific files by using the --files flag. This targets the AI-powered resolver to only process the designated working tree files instead of the entire repository.

How does OpenSpec context improve git merge conflict resolution?▼

OpenSpec context bundles improve git merge conflict resolution by providing additional metadata to the AI resolver. This context helps the agent infer the correct resolution for conflict blocks and produce an auditable merge resolution.

Do I need git to use an AI-powered merge conflict resolver?▼

Yes, you need git installed to use this AI-powered merge conflict resolver. The tool requires git to read working tree files, analyze conflict blocks, and write resolved changes back into your repository.

What are the limitations of AI-powered git merge conflict resolution?▼

A key limitation of AI-powered git merge conflict resolution is uncertainty. When confidence is low, the resolver will not write changes in place but will preserve the original conflict markers for manual review.

Related Skills

Explore More Software Engineering Skills→
kkreditkkredit
3

resolve

Automates Git conflict detection, resolution, and continuation for rebase, merge, and restack operations.

Community
Intermediate
lucasilverentandlucasilverentand
3

merge-conflicts

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

Community
Basic
Patasse97Patasse97

agenthub

Coordinate parallel AI agents in isolated git worktrees and merge the winning branch.

Community
Advanced
CuriousLearnerCuriousLearner
27

conflict-resolver

Analyze Git merge conflict types and propose automated or manual resolution strategies.

Community
Advanced