🔀

DevOpsGo

Merge Strategy

Merge Strategy is a DevOps skill for Claude Code, published by marcus in sidecar.

1K stars79 forkson marcus/sidecarAdded 2026/08/21Repository updated 2026/08/21

View source on GitHub Download repo ZIP

agentic-aiagentic-workflowsclaude-codetui

Install in seconds

Install Merge Strategy

Copy Merge Strategy into your Claude Code skills folder. Run the command in your terminal, or review the source on GitHub before installing.

terminal

npx degit https://github.com/marcus/sidecar/tree/main/.claude/skills/merge-strategy ~/.claude/skills/merge-strategy

Requires Node.js. Downloads this skill only — not the rest of the repository — into your Claude Code skills folder.

Without Node.js

git clone https://github.com/marcus/sidecar.git

Clones the whole repository, then copy the skill’s own directory into your skills folder yourself.

In this catalog

Source file: .claude/skills/merge-strategy/SKILL.md in marcus/sidecar
Installs to: ~/.claude/skills/merge-strategy
Collection: One of 16 skills cataloged from this repository
Category: DevOps — 798 skills

What Merge Strategy does

Merge Strategy covers git pull and merge workflows in sidecar, including merge, rebase, fast-forward, squash, and protected-branch handling. Use it when configuring branch integration behavior or deciding how changes should be merged.

Merge Strategy is cataloged under DevOps on DirSkills. Merge Strategy comes from a repository tagged agentic-ai, agentic-workflows, claude-code and tui.

Documentation

README

Excerpt

Merge Strategy Configuration

This skill covers sidecar's git merge and pull operations, their current implementation, known gaps, and recommended configuration patterns.

Current Implementation

Git Status Plugin Pull Strategies

Location: internal/plugins/gitstatus/pull_menu.go, internal/plugins/gitstatus/remote.go

The git-status plugin offers four pull strategies via a modal menu:

This is the opening of the README. Read the full README on GitHub.

Frequently asked about Merge Strategy

What else does marcus publish alongside Merge Strategy?
Merge Strategy is one of 16 skills that DirSkills catalogs from marcus/sidecar, the repository it ships in. Its siblings there include Create Adapter, Create Modal and Create Plugin. Each one is a separate skill with its own page in this directory, installs the same way Merge Strategy does, and is maintained by marcus in that same repository. The rest of the collection is listed on the marcus/sidecar page.
How does Merge Strategy compare to other DevOps skills?
Merge Strategy ranks #428 by stars among the 798 DevOps skills in this catalog. The most-starred ones next to it are Backend Patterns, API Connector Builder and Migration. DirSkills ranks by the star count of the repository each skill ships in, so that order reflects how popular those repositories are rather than any review of Merge Strategy against them. Open each page to compare what they document and how they install.

More from marcus/sidecar

Merge Strategy is one of 16 skills cataloged on DirSkills from marcus/sidecar.

See all 16 skills →

Create Adapter

Create Adapter covers building conversation adapters that import AI chat history from tools like Claude Code, Cursor, Warp, and Codex. Use it when creating or debugging an adapter’s parsing, caching, watch handling, or performance behavior.

Create Modal

Create Modal builds declarative dialogs with the internal/modal library, including confirm, input, select, form, and custom sections. Use it when adding modals or dialogs that need built-in keyboard, mouse, and overlay handling.

Create Plugin

Create Plugin explains how to build Sidecar plugins that implement the plugin interface, render Bubble Tea views, and wire keyboard input, footer hints, event bus, and lifecycle hooks. Use it when adding a plugin or debugging plugin rendering and init/stop behavior.

Create Theme

Create Theme configures Sidecar color themes, including base theme selection, color overrides, gradient borders, tab styles, and syntax themes. Use it when creating or adjusting UI appearance or troubleshooting color and style issues.

Drag Pane

Drag Pane implements drag-to-resize behavior for two-pane layouts. Use it when adding or fixing divider dragging, width clamping, mouse hit regions, or saved pane widths.

Feature Flags

Feature Flags gates experimental functionality in Sidecar with user-configurable settings. Use it to register flags, check them in code, and manage config or CLI overrides with clear priority rules.

More DevOps skills

Merge Strategy is one of 798 DevOps skills cataloged on DirSkills, ranked #428 by stars among them.

Browse all DevOps skills →

Backend Patterns

Backend Patterns covers backend architecture patterns, API design, database optimization, and server-side best practices for Node.js, Express, and Next.js API routes. Use when building or reviewing Node.js, Express, or Next.js API routes and their data access.

API Connector Builder

API Connector Builder builds a new API connector or provider by matching an existing integration pattern in the codebase exactly. Use it when adding a new integration to a project without introducing a second architecture.

Migration

Migration implements reversible compatibility-safe transitions for schema, data, API, protocol, configuration, or dependency changes. Use it when rollback and preservation proof are required.