Can I sync from a branch other than 'main'?

Yes, you can provide an optional source-branch argument (e.g., /bkff:git-sync develop) to sync changes from any valid remote branch.

What happens if I have uncommitted changes?

To prevent data loss, the skill will detect uncommitted changes and require you to either commit or stash them before proceeding with the sync process.

What happens if there are merge conflicts?

If a conflict occurs, the skill will list the specific files requiring attention and provide clear, step-by-step instructions on how to resolve them and finish the sync.

How does git-sync decide between rebase and merge?

The skill checks if your current branch has been pushed to the origin. If it hasn't, it uses a rebase to keep history clean. If it has been pushed, it uses a merge to preserve commit history and avoid breaking the branch for others.

Smart Git Sync

Name: Smart Git Sync
Author: kbrockhoff

bykbrockhoff

0•

Developer Tools

Synchronizes local branches with remote changes using an intelligent strategy selector that toggles between rebase and merge based on branch status.

Smart Git Sync automates the complex decision-making process of keeping local branches up-to-date with remote repositories. By analyzing whether a branch has already been pushed to the origin, the skill automatically selects a rebase strategy for local-only work to maintain a clean, linear history, or a merge strategy for public branches to avoid destructive history rewrites. It includes built-in safety mechanisms such as uncommitted change detection and 'rerere' support, making it an essential tool for developers who want to minimize manual Git management and avoid common integration errors.

Key Features

010 GitHub stars

02Support for Git rerere to remember conflict resolutions

03Pre-integration safety checks for uncommitted changes

04Context-aware strategy selection (Rebase vs. Merge)

05Detailed conflict reporting and resolution guidance

06Automatic remote fetching and pruning

Use Cases

01Safely integrating upstream updates into shared public branches without force-pushing.

02Keeping local feature branches updated with the latest main branch changes while maintaining a clean history.

03Streamlining repetitive git fetch and integration workflows through a single Claude Code command.

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add kbrockhoff/brockhoff-tools-claude git-sync

For use in Claude.ai and ChatGPT

Download Skill