skills.rest
axiomantic
axiomanticOFFICIAL
Explore all skills by this author →
GitHub

resolving-merge-conflicts

Resolve Git merge conflicts by synthesizing both sides into resolved files.

8|5|Updated Dec 30, 2025
Search Tags:#git#workflow#synthesis#conflict-resolution#version-control#merge-conflicts
One-click install
npx skills add https://github.com/axiomantic/spellbook --skill resolving-merge-conflicts
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolving-merge-conflicts
Source: https://github.com/axiomantic/spellbook/tree/main/skills/resolving-merge-conflicts
Command: npx skills add https://github.com/axiomantic/spellbook --skill resolving-merge-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Merges often fail when there are conflicting changes. This Skill provides a structured approach to resolve merge conflicts without discarding valuable work.

Core Features & Use Cases

  • Synthesizes changes from both sides to create a coherent, conflict-free result.
  • Guides per-file analysis, safe editing, and validation with tests.
  • Useful during git merge, git rebase, or any multi-branch integration.

Quick Start

Apply the per-file synthesis workflow to a conflicted repository to produce a clean, merge-ready state.

Frequently Asked Questions about resolving-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 changes from either branch?▼

Git merge conflicts can be resolved by synthesizing changes from both sides, analyzing base/ours/theirs data per file to produce a conflict-free result that preserves valuable work from both branches.

What is the best way to handle merge conflicts during a git rebase?▼

Handling merge conflicts during a git rebase involves per-file analysis of the conflicting changes, synthesizing both sides into a clean result, and validating with tests before continuing the rebase workflow.

Can I use this approach for multi-file integrations across diverse branches?▼

Yes, this approach supports multi-file integrations across diverse branches by applying per-file analysis with base/ours/theirs data to generate a structured conflict-resolution plan for your software project.

How does conflict resolution synthesis work when merging local feature branches?▼

Conflict resolution synthesis works by analyzing base, ours, and theirs data for each conflicted file, then outputting a resolution plan and resolved files that integrate both sides into a coherent, conflict-free state.

What should I do after synthesizing merge conflict resolutions to verify the result?▼

After synthesizing merge conflict resolutions, you should validate the output with tests and review the generated verification report to ensure the clean, merge-ready state is coherent and functional.

Related Skills

Explore More Software Engineering Skills→
buvisbuvis
2

resolve-git-conflicts

Diagnose git conflict types and guide per-file resolution with abort options.

Official
Advanced
tomascuprtomascupr
68

refire

Apply verified code review findings to git repository files and verify fixes.

Community
Advanced
Hey-DigaHey-Diga
16

merge-to-staging

Merge the current feature branch into a fresh staging branch with automated conflict analysis.

Official
Advanced
dtsongdtsong
1

Git Conflicts

Analyze Git conflict markers and guide resolution with checkout commands.

Community
Intermediate