Merge Strategy
Define merge strategies (squash, rebase, merge commits) that balance history clarity with practical workflow. Use when setting CI/CD merge policies.
Install
/plugin marketplace add sethdford/claude-skillsThe repo is a Claude Code plugin marketplace. Run /plugin afterwards to pick the plugin that includes this skill.
npx skills add sethdford/claude-skills --skill merge-strategygit clone --depth 1 https://github.com/sethdford/claude-skills.git /tmp/claude-skills
mkdir -p ~/.claude/skills
cp -r /tmp/claude-skills/tech-lead/code-review-leadership/skills/merge-strategy ~/.claude/skills/merge-strategyPersonal skills live in ~/.claude/skills. Use .claude/skills in a project folder to share a skill with your team.
From the SKILL.md
# Merge Strategy Choose and document merge strategies that work for your team's workflow and history preferences. ## Context You are helping a tech lead decide on merge strategy for a repository. If you have insights into the team's workflow (frequent hotfixes, long-lived feature branches, monorepo), use them. ## Domain Context - Git workflow philosophies vary (GitHub Flow, Git Flow, trunk-based development) each with different merge strategies - Research (Forsgren et al.): high-performing teams use strategies that enable fast feedback loops - History readability matters: blame, bisect, and log mining all depend on clean history Key principles: 1. **Match strategy to workflow**: GitHub Flow (fast, short-lived branches) uses squash; Git Flow (long-lived releases) uses merge commits 2. **Commits are both history and workflow**: Commit messages serve future readers (blame, changelog); granular commits help with bisect and cherry-pick 3. **Automate the policy**: Enforce strategy in CI/CD, don't rely on developer discipline ## Instructions 1. **Assess team workflow**: Are branches short-lived (< 1 day) or long-lived (weeks)? Do you cherry-pick or do full releases? 2. **Choose strategy**: - **Squash**: Simplifies history, good for short-lived feature branches, makes blame harder - **Rebase**: Linear history, good for learning flow, harder to track original branch context
Details
- Skill name
merge-strategy- Repository
- sethdford/claude-skills
- Path
tech-lead/code-review-leadership/skills/merge-strategy/SKILL.md- License
- MIT
- Repo updated
- 11 March 2026
FAQ
What does the Merge Strategy skill do?
Define merge strategies (squash, rebase, merge commits) that balance history clarity with practical workflow. Use when setting CI/CD merge policies.
How do I install the Merge Strategy skill?
Claude Code plugin: /plugin marketplace add sethdford/claude-skills. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.
Is Merge Strategy popular?
It lives in sethdford/claude-skills, which has 48 GitHub stars and 10 forks.
Related skills
A B Test Design
48sethdford/claude-skills
Design rigorous A/B tests with hypotheses, variants, metrics, and sample size calculations.
A B Test Design Pm
48sethdford/claude-skills
Analytics and experimentation skill for product managers.
Abuse Case Design
48sethdford/claude-skills
Design abuse cases (negative use cases) showing how attackers misuse system features. Use when identifying attacks that exploit intended functionality or business logic flaws.
Migration Strategy
48sethdford/claude-skills
Plan large-scale migrations from old systems to new architectures. Use when modernizing legacy systems or upgrading infrastructure.
Kubernetes Security
48sethdford/claude-skills
Secure Kubernetes clusters through RBAC, network policies, pod security, and runtime monitoring.
Migration Strategy
48sethdford/claude-skills
Safe schema migrations, backward compatibility, zero-downtime deployments, and rollback strategies.
Browse the most popular Claude skills, all devops & cloud skills, or write your own with the skills generator.