git-merge-strategy
CommunityConfidently pick and apply merge strategies
Authordennisonbertram
Version1.0.0
Installs0
System Documentation
What problem does it solve?
Squash merges, rebases, and merge commits each have trade-offs. This skill provides practical guidance for selecting the appropriate git merge strategy during PR workflows and resolving conflicts effectively.
Core Features & Use Cases
- Clear decision criteria for when to squash, rebase, or merge-commit PRs.
- Step-by-step conflict-resolution workflow and safe-practice reminders (e.g., avoid unsafe force pushes).
- Real-world use cases illustrating strategy selection during PR merges and conflict scenarios.
Quick Start
Select a merge strategy for the PR and perform the merge using the recommended GitHub CLI commands while following the conflict-resolution steps if conflicts appear.
Dependency Matrix
Required Modules
None requiredComponents
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: git-merge-strategy Download link: https://github.com/dennisonbertram/go-agent-harness/archive/main.zip#git-merge-strategy Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
Agent Skills Search Helper
Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.