Skills
.Work. You
Rest

merge-strategy

Community

Coordinate Git merge strategies with confidence.

Software Engineering#git#workflow#merge#branch-management#conflicts#sidecar#pull-strategy
Authormarcus
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Simplifies choosing and applying Git merge strategies and managing conflicts within Sidecar's unified workflow.

Core Features & Use Cases

  • Git pull strategy options exposed in Sidecar to perform merge, rebase, fast-forward, and squash workflows.
  • Workspace merge workflows including PR-based and direct-merge patterns with post-merge cleanup.
  • Configurable defaults, merge commit templates, and safety checks for protected branches.

Quick Start

Configure your project to use a defined merge strategy (no-ff, ff, ff-only, squash, or rebase) and follow the workflow to merge branches in Sidecar.

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: merge-strategy
Download link: https://github.com/marcus/sidecar/archive/main.zip#merge-strategy

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.