Skills
.Work. You
Rest

resolving-merge-conflicts

Official

Surgical merge-conflict resolution.

Software Engineering#git#workflow#synthesis#conflict-resolution#version-control#merge-conflicts
Authoraxiomantic
Version1.0.0
Installs0

System Documentation

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.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: resolving-merge-conflicts
Download link: https://github.com/axiomantic/spellbook/archive/main.zip#resolving-merge-conflicts

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.