skills.rest
dennisonbertram
dennisonbertramCOMMUNITY
Explore all skills by this author →
Website𝕏@DennisonBertramGitHub

git-merge-strategy

Guide git merge strategy selection for pull requests with CLI commands.

1|1|Updated Mar 6, 2026
Search Tags:#git#github#cli#strategy#merge#pr#conflicts
One-click install
npx skills add https://github.com/dennisonbertram/go-agent-harness --skill git-merge-strategy
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-merge-strategy
Source: https://github.com/dennisonbertram/go-agent-harness/tree/main/skills/git-merge-strategy
Command: npx skills add https://github.com/dennisonbertram/go-agent-harness --skill git-merge-strategy

SYSTEM DOCUMENTATION & REQUIREMENTS

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.

Frequently Asked Questions about git-merge-strategy

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
What is the best git merge strategy for my pull request?▼

Use squash merges to condense commits, rebase for linear history, or merge commits to preserve topology. This skill provides decision criteria to choose the appropriate strategy for your PR.

How do I resolve git merge conflicts during a pull request?▼

Resolve git merge conflicts by following this skill's step-by-step workflow, which includes safety checks to avoid unsafe force pushes and specific CLI commands for common PR conflict scenarios.

When should I squash commits instead of using a rebase or merge commit?▼

Squash commits when you need a clean, single-commit history for a feature. This skill outlines clear trade-offs and use cases for selecting squash, rebase, or merge commits in GitHub PR workflows.

How do I avoid unsafe force pushes when rebasing a git branch?▼

Avoid unsafe force pushes by following this skill's procedural safety checks during conflict resolution. It implements clear requirements for safe rebasing and merging without losing commit history.

Can I use GitHub CLI commands to apply different git merge strategies?▼

Yes, you can use GitHub CLI commands to apply merge strategies. This skill provides specific CLI command examples for executing squash, rebase, and merge commit workflows safely.

Related Skills

Explore More Software Engineering Skills→
aberrantCodeaberrantCode
1

finishing-a-development-branch

Verify tests pass and merge, open a PR, retain, or delete a Git branch.

Community
Intermediate
nuurpronuurpro
1

land-and-deploy

Merge pull requests after CI passes and verify production health with canary checks.

Community
Advanced
chf3198chf3198

github-review-merge-admin

Validate GitHub pull request approvals, status checks, and merge readiness.

Community
Intermediate
chiptoe-svgchiptoe-svg

update-skills

Detect and merge upstream updates for git branch-distributed skills.

Community
Intermediate