sync-branch

Solid

Merges one branch into another with conflict handling. Stashes work, updates both branches, merges, resolves conflicts preserving both sides, pushes, and restores state. Use when keeping a long-lived branch in sync with its upstream.

AI & Automation 4 stars 0 forks Updated yesterday MIT

Install

View on GitHub

Quality Score: 83/100

Stars 20%
23
Recency 20%
100
Frontmatter 20%
70
Documentation 15%
100
Issue Health 10%
80
License 10%
100
Description 5%
100

Skill Content

# Sync Branch Merge one branch into another, handling conflicts and preserving work in progress. ## Preferences _Read `~/.claude/skills/sync-branch/preferences.md` using the Read tool. If not found, no preferences are set._ ## Context _On startup, use Bash to detect: current git branch, git status, and remote URL (`git remote get-url origin`). Skip any that fail._ ## Command routing Check `$ARGUMENTS`: - **`help`** → display help then stop - **`config`** → interactive setup then stop - **`reset`** → delete `~/.claude/skills/sync-branch/preferences.md`, confirm, stop - **anything else** → sync branches ### Flags Parse from `$ARGUMENTS`: - **`--no-push`** — merge locally, don't push - **`--dry-run`** — show what would happen without executing - **Positional args**: `$0` = source branch, `$1` = target branch ### Help ``` Sync Branch — Merge one branch into another Usage: /sync-branch Merge default source into current branch /sync-branch <source> Merge source into current branch /sync-branch <source> <target> Merge source into target /sync-branch --no-push <source> Merge without pushing /sync-branch --dry-run <source> Preview without executing /sync-branch config Set defaults /sync-branch reset Clear preferences /sync-branch help This help Examples: /sync-branch main /sync-branch main all-demos /sync-branch --dry-run main feature...

Details

Author
mostafa-drz
Repository
mostafa-drz/claude-skills
Created
7 months ago
Last Updated
yesterday
Language
HTML
License
MIT

Similar Skills

Semantically similar based on skill content — not just same category