sync-branch
SolidMerges 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.
Install
Quality Score: 83/100
Skill Content
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
workflow-branch-sync
Sync the current branch with the default branch via rimba or git, then resolve conflicts file by file with a per-hunk rationale and a keep-mine / keep-main / manual recommendation before staging. Push only happens after explicit confirmation — never automatic.
sync
Sync the current branch with the latest changes from the default branch.
git-branch-sync
Fetch the latest base branch and rebase the current branch onto it, surfacing conflicts clearly. Use when the user asks to sync, rebase, update from main, pull latest changes, or /git-branch-sync. Also trigger on "catch up with main", "rebase onto main", "update my branch", or whenever the user signals their branch is stale vs base. Runs immediately without asking for confirmation.