Skip to main content
ClaudeWave
ES, Spanish
Slash Command1.4k estrellas del repoactualizado 22d ago

sync-branch

The sync-branch command synchronizes a Git branch with the default branch by fetching remote changes, then applying them via rebase or merge. Use this when you need to update your current branch with the latest code from main or master while preserving local work through automatic stashing and conflict detection.

Instalar en Claude Code
Copiar
mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/CloudAI-X/claude-workflow-v2/HEAD/commands/sync-branch.md -o ~/.claude/commands/sync-branch.md
Después abre una sesión nueva de Claude Code; el slash command carga automáticamente.

sync-branch.md

## Context

- Current branch: !`git branch --show-current`
- Default branch: !`git remote show origin 2>/dev/null | grep 'HEAD branch' | cut -d' ' -f5 || echo "main"`
- Uncommitted changes: !`git status --porcelain`
- Commits ahead/behind: !`git rev-list --left-right --count origin/$(git remote show origin 2>/dev/null | grep 'HEAD branch' | cut -d' ' -f5 || echo "main")...HEAD 2>/dev/null || echo "unknown"`
- Current remote: !`git remote -v | head -2`

## Task

Safely sync the current branch with the default branch:

1. Check for uncommitted changes - if any, stash them
2. Fetch the latest from origin
3. Based on argument (default: rebase):
   - **rebase**: `git rebase origin/<default-branch>`
   - **merge**: `git merge origin/<default-branch>`
4. Handle any conflicts by reporting them clearly
5. If changes were stashed, pop them
6. Report the sync status

Strategy: $ARGUMENTS