Skills
.Work. You
Rest

dk-merge-resolve

Official

Safely resolve git conflicts with guided steps.

Software Engineering#git#workflow#safety#conflict-resolution#guardrails#merge-conflicts
Authordeepklarity
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Resolve merge conflicts in the current branch and provide guided, safe resolution steps to minimize disruption to your workflow.

Core Features & Use Cases

  • Step-by-step conflict diagnosis: identifies the source of conflicts (merge, rebase, stash pop, cherry-pick) and prints an actionable abort command.
  • Safe conflict resolution: preserves user changes while integrating incoming changes, with guardrails to protect unstaged work.
  • Resilient guidance: detailed triage, per-file resolution strategy, and verification steps to ensure a clean merge.

Quick Start

Run the guided merge-conflict resolution on your current branch when conflicts appear.

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: dk-merge-resolve
Download link: https://github.com/deepklarity/harness-kit/archive/main.zip#dk-merge-resolve

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.