What happens if I have uncommitted changes?

The skill detects local changes and triggers the 'creating-commit' skill to secure your work before proceeding with the synchronization.

Can I sync a branch other than the one I'm currently on?

Yes, you can specify a target branch in your natural language request, and the skill will handle the checkout and sync process for you.

Does it handle forks differently than standard repositories?

Yes, it automatically identifies if you are working on a fork and fetches from the correct upstream or origin remote accordingly.

What if my local branch has diverged from the remote?

If a fast-forward merge is not possible due to diverged histories, the skill will alert you and suggest using the 'rebasing-branch' skill to reconcile changes.

Git Branch Sync

Name: Git Branch Sync
Author: cblecker

bycblecker

•

Productivity & Workflow

Automates branch synchronization by intelligently detecting repository remotes and performing safe, fork-aware updates.

The Git Branch Sync skill provides a standardized, automated workflow for keeping local branches synchronized with remote repositories. It replaces manual fetch and merge commands with a robust script that identifies whether you are working on a standard origin or a fork, ensuring changes are pulled from the correct upstream source. The skill includes built-in safeguards for uncommitted changes and fast-forward merge checks, helping developers maintain a clean repository state without the risk of accidental merge conflicts or state corruption.

Key Features

01Automatic fork vs. origin detection for intelligent upstream syncing.

02Support for both targeted branch syncing and current branch updates.

03Integrated uncommitted change detection with an automated commit workflow.

041 GitHub stars

05Structured JSON error handling for precise conflict and divergence reporting.

06Fast-forward merge validation to prevent messy commit histories.

Use Cases

01Synchronizing a feature branch with origin remotes before initiating a pull request.

02Updating a local main branch with the latest changes from an upstream fork.

03Safely pulling latest project changes in complex repository structures without manual CLI intervention.

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add cblecker/claude-skills syncing-branch

For use in Claude.ai and ChatGPT

Download Skill