skills.rest
damilola-elegbede-org
damilola-elegbede-orgOFFICIAL
Explore all skills by this author →
GitHub

merge

Merge Git branches with conflict detection and optional auto-resolution.

Updated Jul 10, 2025
Search Tags:#automation#git#merge#workflows#branch-management#conflicts
One-click install
npx skills add https://github.com/damilola-elegbede-org/claude-config-5ad01dbe --skill merge-damilola-elegbede-org
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/damilola-elegbede-org/claude-config-5ad01dbe/tree/main/system-configs/.claude/skills/merge
Command: npx skills add https://github.com/damilola-elegbede-org/claude-config-5ad01dbe --skill merge-damilola-elegbede-org

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Merge a branch into the current branch safely, with conflict detection and optional strategies, while preserving uncommitted changes.

Core Features & Use Cases

  • Detects conflicts, saves conflict metadata to .tmp/merge, and guides resolution.
  • Supports automatic conflict resolution (--theirs, --ours) and an abort option to revert safely.
  • Stashes uncommitted changes before merge and restores them after completion.
  • Provides clear status and merge summary after a successful operation.

Quick Start

Run /merge to merge a source branch into the current branch, for example /merge develop, with optional flags --theirs, --ours, or --abort.

Frequently Asked Questions about merge

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

FAQPage Schema
Can I automatically resolve git merge conflicts using specific strategies?▼

Git merge conflicts are detected automatically during the branch merge process. The operation saves conflict metadata to .tmp/merge, provides guided resolution steps, supports automatic resolution using --ours or --theirs strategies, and offers an abort option to safely revert the merge.

Does the merge process support custom git merge strategies like -X ours or -X theirs?▼

When a git merge fails due to conflicts, the operation saves detailed conflict metadata to .tmp/merge and provides an abort option to safely revert the repository to its pre-merge state, preventing broken branch states.

How do I revert a failed git branch merge safely?▼

Yes, the merge process supports custom git merge strategies by accepting flags like --ours and --theirs. These flags apply the corresponding -X strategies to the merge command, enabling automatic conflict resolution favoring either the current or source branch.

Do I need to manually fetch the latest changes before merging a git branch?▼

To revert a failed git branch merge safely, you can use the --abort flag. This abort option reverts the repository to its pre-merge state, discarding the failed merge attempt and restoring the previous branch status.

Related Skills

Explore More Software Engineering Skills→
kirvinkirvin

sync

Fetch upstream changes and rebase the current Git branch onto them.

Community
Intermediate
cbleckercblecker
5

creating-pull-request

Automate GitHub pull request creation with branch pushing and PR metadata.

Community
Basic
ThePyProgrammerThePyProgrammer

pr-workflow

Automate pull request workflows with GitHub CLI and git.

Community
Intermediate
Knuckles-TeamKnuckles-Team
2

git-advanced

Automate Git history fixes using rebase, cherry-pick, and bisect workflows.

Official
Advanced