skills.rest
Cynthia1070711
Cynthia1070711COMMUNITY
Explore all skills by this author →
WebsiteGitHub

branch-merge

Merges Git story branches into main with fuzzy branch matching and conflict resolution.

10|3|Updated Mar 7, 2026
Search Tags:#git#version control#merge#conflict resolution#branch#stash#story branch
One-click install
npx skills add https://github.com/Cynthia1070711/PHYCOOL_Tools --skill branch-merge-cynthia1070711
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: branch-merge
Source: https://github.com/Cynthia1070711/PHYCOOL_Tools/tree/main/config-templates/claude/skills/branch-merge
Command: npx skills add https://github.com/Cynthia1070711/PHYCOOL_Tools --skill branch-merge-cynthia1070711

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Merging story development branches back into main often involves tedious manual steps: finding the exact branch name, handling uncommitted changes, and resolving merge conflicts. This Skill automates that workflow with a guided, safe process. ## Core Features & Use Cases - Fuzzy Branch Matching: Resolves short names like d7 to full branch names such as story/d7, with a candidate list when multiple matches exist. - Automatic Stash Handling: Detects a dirty working tree and offers stash-merge-pop, commit-first, or discard options before merging. - Conflict Resolution Assistance: Auto-resolves simple conflicts like generated timestamps, while presenting code logic conflicts to the user for manual decision. - Use Case: After finishing a story on branch story/d7, simply ask to merge it into main; the Skill verifies the working tree, executes the merge, resolves trivial conflicts, and reports a structured summary. ## Quick Start Merge the story branch d7 into my current branch and handle any conflicts that come up.

Frequently Asked Questions about branch-merge

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

FAQPage Schema
How do I merge a Git branch when I only know part of its name?▼

Use fuzzy branch matching: the Skill first tries an exact match with git rev-parse, then searches branches containing the given text. Short names like d7 resolve to story/d7, and multiple matches are listed for you to choose.

How to merge a branch with uncommitted changes in the working tree?▼

The Skill checks git status before merging and offers three options: stash the changes, merge, then stash pop; commit the changes first; or discard local changes after confirmation. Stash conflicts are resolved before dropping the stash.

Can merge conflicts be resolved automatically in Git?▼

Simple generated-content conflicts like timestamps or auto-generated README sections are auto-resolved by keeping the newer or merge-source version. Code logic conflicts are never auto-resolved; they are shown to the user for a manual decision.

Does merging a branch delete it or push automatically?▼

No. After a successful merge, the source branch is kept and nothing is pushed to the remote unless you explicitly request it. Untracked files do not affect the merge and require no special handling.

What happens when git stash pop causes a conflict after merge?▼

The stash is not dropped automatically when a pop conflict occurs. You resolve the conflicting files, mark them with git add, and then manually run git stash drop to clean up the stash entry.

Related Skills

Explore More Software Engineering Skills→
asochan-aiasochan-ai

prep-workspace

Verify repository state, create a feature branch, and detect unfinished work.

Official
Advanced
kelsi-andrewsskelsi-andrewss
1

merge-worktree

Merge a story worktree into the development branch and clean up resources.

Community
Advanced
Bae-ChangHyunBae-ChangHyun

github-pr-merge

Validate GitHub pull requests and merge them after checks pass.

Community
Advanced
khokskhoks
2

change_management

Route tracked file modifications through pull requests for owner review.

Community
Advanced