Skills
.Work. You
Rest

rebase-changelog-resolver

Community

Automatically resolve CHANGELOG.md merge conflicts during rebase.

Software Engineering#git#merge conflict#rebase#developer tool#change log
Authormarvelousempire
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill resolves merge conflicts in the CHANGELOG.md file during rebase operations, streamlining the process and reducing manual intervention.

Core Features & Use Cases

  • Automatic Conflict Resolution: Automatically resolves merge conflicts in CHANGELOG.md by keeping both entries with the newest-first ordering.
  • Mechanical Pattern Recognition: Recognizes the standard pattern of merge conflicts in CHANGELOG.md and resolves them without manual editing.
  • Use Case: When you encounter a merge conflict in the CHANGELOG.md file during a rebase, this Skill can automatically resolve it, ensuring that both entries are preserved in the correct order.

Quick Start

Run /rebase-changelog-resolver to automatically resolve the conflict in your CHANGELOG.md file.

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: rebase-changelog-resolver
Download link: https://github.com/marvelousempire/ai-skills-library/archive/main.zip#rebase-changelog-resolver

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 620,000+ vetted skills library on demand.