Skills
.Work. You
Rest

resolve-merge-conflicts

Official

Automate Git merge conflict resolution.

Software Engineering#automation#git#developer tools#code integration#merge conflicts#rebase
AuthorTalonT-Org
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill automatically resolves Git merge conflicts that arise during rebasing, preventing manual intervention and ensuring smooth integration of code changes.

Core Features & Use Cases

  • Goal-Aware Conflict Analysis: Analyzes the intent of conflicting code sections based on the implementation plan and commit history.
  • Automated Resolution: Resolves conflicts with HIGH or MEDIUM confidence, merging changes intelligently.
  • Escalation: Safely aborts and escalates when conflicts are too complex or ambiguous for automated resolution.
  • Use Case: When a pull request merge fails due to rebase conflicts, this skill can automatically analyze and resolve them, allowing the merge to proceed without developer oversight.

Quick Start

Use the resolve-merge-conflicts skill to resolve conflicts in the worktree at /path/to/worktree, using the plan at /path/to/plan.md and the base branch integration/run-1.

Dependency Matrix

Required Modules

None required

Components

references

💻 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: resolve-merge-conflicts
Download link: https://github.com/TalonT-Org/AutoSkillit/archive/main.zip#resolve-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.