skills.rest
twikus
twikusCOMMUNITY
Explore all skills by this author →
GitHub

merge

Merge Git branches with context-aware conflict resolution using GitHub CLI.

3|3|Updated Jan 15, 2026
Search Tags:#automation#git#merge#branch#pull-request#conflicts
One-click install
npx skills add https://github.com/twikus/claude-configuration --skill merge-twikus
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/twikus/claude-configuration/tree/main/claude-code-config/skills/git-merge
Command: npx skills add https://github.com/twikus/claude-configuration --skill merge-twikus

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps developers merge branches with context-aware conflict resolution, reducing manual editing and time spent on merges.

Core Features & Use Cases

  • Context-aware conflict resolution that analyzes current branch, target branch, and recent commits to guide merge decisions.
  • Integrates with Git and GitHub CLI to inspect PRs, fetch data, and perform merges safely.
  • Safe-merge workflow with explicit abort, validation, and clear conflict reporting for manual steps when needed.
  • Use cases include feature branch integration, release merges, and long-running branches with frequent conflicts.

Quick Start

Provide the target branch name as the argument to this skill, for example: merge feature/awesome, and let it automatically attempt a conflict-aware merge; review and commit the result if needed.

Frequently Asked Questions about merge

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

FAQPage Schema
How do I automate Git branch merging with conflict resolution?▼

Git branch merging is automated by fetching pull request data and analyzing recent commits to guide conflict resolution. The process performs merges using --no-commit, detects conflicts, and provides automated or guided resolutions based on the analyzed context.

What is context-aware conflict resolution in Git?▼

Context-aware conflict resolution analyzes the current branch, target branch, and recent commits to guide merge decisions. It uses repository history and pull request data to provide automated or guided fixes for conflicting file changes.

Do I need GitHub CLI to merge branches and resolve conflicts?▼

Yes, Git and the GitHub CLI are required to merge branches using this method. The GitHub CLI fetches pull request data, inspects commits, and performs the safe-merge workflow with automated conflict detection.

How do I safely merge a long-running feature branch with frequent conflicts?▼

Safely merge a long-running feature branch by applying a safe-merge workflow using --no-commit. This validates the merge, detects conflicts, and provides clear reporting for manual steps, allowing you to abort if needed.

What is the best way to handle release merges in Git repositories?▼

The best way to handle release merges is using a context-aware workflow that inspects pull requests and recent commits. This provides careful conflict resolution and validates the merge before committing, which is critical for stable release branches.

Related Skills

Explore More Software Engineering Skills→
wyattjohwyattjoh
1

pr-status

Visualize GitHub pull request stacks and identify stale local branches.

Community
Intermediate
dmzoneilldmzoneill
2

rebase-pr

Rebase a Git pull request branch onto main with conflict resolution and linting.

Community
Advanced
pradyumnasagarpradyumnasagar
6

agent-handoff

Automate inter-skill data transfer and provenance capture via JSON Material Passports.

Community
Advanced
CarGDevCarGDev

Git Workflow Expert

Guide Git workflows with branching strategies and merge versus rebase decisions.

Community
Intermediate