Skills
.Work. You
Rest

merge-base

Community

Intelligent Git merge with conflict resolution.

Software Engineering#git#developer tools#version control#code integration#merge#conflict resolution
Authorlklimek
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill automates the process of merging a base branch into a feature branch, intelligently handling conflicts and providing a clear report on behavioral changes.

Core Features & Use Cases

  • Automated Merging: Fetches remote changes and merges the base branch into the current feature branch.
  • Intelligent Conflict Resolution: Analyzes conflicts and resolves them based on preserving intent and existing behavior.
  • Behavioral Change Reporting: Summarizes changes, identifies potential risks, and lists relevant upstream contributors.
  • Use Case: When working on a long-lived feature branch, use this Skill to regularly sync with the main development branch, ensuring your feature stays up-to-date and conflicts are managed efficiently.

Quick Start

Merge the base branch into the current feature branch, resolving any conflicts automatically.

Dependency Matrix

Required Modules

None required

Components

scripts

💻 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: merge-base
Download link: https://github.com/lklimek/claudius/archive/main.zip#merge-base

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.