manual-merge-branches

Community

Safely merge branches with user approval.

Authoreivindeb
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill provides a controlled and safe way to merge branches in a Git repository, ensuring that conflicts are handled only with explicit user authorization, preventing accidental data loss or corruption.

Core Features & Use Cases

  • Controlled Merging: Initiates Git merges only when explicitly invoked.
  • Conflict Resolution Protocol: Guides the user through resolving merge conflicts step-by-step, providing detailed information and requiring explicit approval for each resolution.
  • Pre-merge Synchronization: Ensures branches are up-to-date with remotes before merging.
  • Use Case: When a team is collaborating on a feature branch and a merge conflict arises, this skill can be used to systematically resolve the conflict after reviewing the changes with the developer.

Quick Start

Use the manual-merge-branches skill to resolve the current merge conflicts.

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: manual-merge-branches
Download link: https://github.com/eivindeb/agent-skills/archive/main.zip#manual-merge-branches

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