Cdd Merge Base — Git skill for Claude Code
Integrate the current state of the base branch into the feature branch.
How to install Cdd Merge Base
Installs to ~/.claude/commands/drabaioli-cdd-cdd-merge-base.md
mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/drabaioli/cdd/HEAD/.claude/commands/cdd-merge-base.md -o ~/.claude/commands/drabaioli-cdd-cdd-merge-base.md Restart Claude Code, or start a new session, for it to be picked up.
What Cdd Merge Base does
Integrate the current state of the base branch into the feature branch. Two phases: a **dry-run conflict assessment** first, then the actual merge with conflict resolution. The approval between the two phases is conditional — the merge runs automatically when the dry run proves the case mechanically trivial (step 4), and stops for approval otherwise.
Run this command on the feature branch (not on the base branch). Use it when:
- The base branch has advanced under your feature branch and you wa
Alternatives in Git
- GitHub Review PR — Use when a PR needs full review — resolves merge conflicts with the base first, then fixes CI failures, then a 1.5k ★
- Claude Code Base Action — This repo is a mirror of the contents of base-action in https://github.com/anthropics/claude-code-action 799 ★
- Validate Title Provided — if [ -z "$PLAN_TITLE" ]; then echo "❌ Error: Plan title required" echo "Usage: /sync-todos-to-github \"Plan Ti 618 ★
Full documentation available on GitHub
View Source RepositoryRelated Skills
Merge Conflict Walkthrough
Walks through each conflicted file in a merge or rebase - lists files, reads markers, proposes a resolution wi
Merge Intel
Pull upstream/main into the fork with intent-driven conflict resolution.
Riper Workflow
by Tony Narlock - Structured development workflow enforcing separation between Research, Innovate, Plan, Execu
Cdd Pre PR
Run a pre-PR checklist for the current branch. Compare against the base branch to identify all changes. This i
PR Desc
Reads git diff between the current branch and main (or a specified base branch), analyzes changed files, and g
Integrate
You are the tool integration engine for claude-flow. Users bring you a resource — a GitHub repo, local files,
Related Agents
GitOps
Git operations specialist. MUST BE USED for branch management, conflict resolution, git history analysis, work
Worker Conflict Resolver
Given a set of PR numbers with mutual merge conflicts (or conflicts against main), produce a unified resolutio
Merge Resolver
Resolve git merge conflicts by analyzing commit history, code intent, and metadata. Use when PRs have conflict