skills.rest
julianobarbosa
julianobarbosaCOMMUNITY
Explore all skills by this author →
Website𝕏@julianobarbosaGitHub

Merge

Automates Git workflows including commit, push, pull request creation, and merge with built-in security checks and CLI integration.

7|1|Updated Jul 12, 2026
Search Tags:#git#workflow#merge#branch#conflicts
One-click install
npx skills add https://github.com/julianobarbosa/claude-code-skills --skill merge
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: Merge
Source: https://github.com/julianobarbosa/claude-code-skills/tree/main/skills/Git-skill
Command: npx skills add https://github.com/julianobarbosa/claude-code-skills --skill merge

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes workflows (resource) and references (resource) components.

What problem does it solve?

This Skill guides safe merging strategies (merge, ff-only, no-ff), conflict resolution, and post-merge verification.

Core Features & Use Cases

  • Merge strategies: Recursive merge, ff-only, or no-ff merges.
  • Conflict resolution: Guidance on resolving conflicts with tools.
  • Post-merge checks: Validate merge integrity and test results.

Quick Start

Merge feature/my-feature into main using a standard merge commit with conflict checks.

Frequently Asked Questions about Merge

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

FAQPage Schema
How do I merge a Git branch without losing commit history?▼

Merge strategies like no-ff (no fast-forward) create explicit merge commits that preserve the complete history of branch integration, making it traceable which commits came from which feature branch.

What's the best way to handle merge conflicts in Git?▼

Resolve conflicts by reviewing conflicting sections, choosing which changes to keep, then staging and committing the resolved files. This Skill provides guidance on conflict resolution workflows and tools.

Can I automate Git merge operations with security checks?▼

Yes, this Skill automates merge workflows with built-in security checks including credential scanning and secret detection, ensuring safe branch integration before merging into main.

How do I verify a merge succeeded after integration?▼

Post-merge verification validates merge integrity and runs test results to confirm the branch integrated correctly and didn't introduce breaking changes.

What's the difference between ff-only and recursive merge strategies?▼

Ff-only rewinds history if possible without creating a merge commit; recursive performs a three-way merge creating an explicit commit. Choose based on whether you need to preserve branch boundaries.

Does this support GitHub CLI integration for pull requests?▼

Yes, this Skill integrates with GitHub CLI to manage pull request creation, branch management, and merge operations as part of the automated Git workflow.

Related Skills

Explore More Software Engineering Skills→
mcj-codermcj-coder
1

branching-strategy-and-conventions

Configure Git branching strategies, Conventional Commits, and merge rules.

Community
Advanced
GainInsightDevGainInsightDev

af-comms-expertise

Send project event notifications to Zulip streams and legacy Slack channels.

Official
Intermediate
julianobarbosajulianobarbosa
7

Git

Automate Git commit, branch, merge, and PR workflows with GitHub CLI and security checks.

Community
Advanced
cowwoccowwoc
4

git-rebase

Create timestamped backup branches and validate git rebase operations.

Community
Intermediate