git-feature-branch-sync

Community

Sync feature branches safely with rebase or merge.

Authorjcdendrite
Version1.0.0
Installs0

System Documentation

What problem does it solve?

It helps you keep your feature branch aligned with the default branch while avoiding unsafe force-pushes, preserving history rules, and minimizing review disruption.

Core Features & Use Cases

  • Divergence detection: Uniformly checks whether your branch is behind the default branch using a trial-merge/divergence strategy so decisions are consistent across hooks and gates.
  • Rebase vs merge decisioning: Recommends rebase for personal, clean branches and merge-main when conflicts, stacking, review-anchored comments, or per-project policy make rebase risky.
  • Force-push safety controls: Guides use of --force-with-lease/--force-if-includes while explicitly refusing to force-push protected targets (default branch, shared branches, and tags).

Quick Start

Use the git-feature-branch-sync skill to determine whether to rebase or merge your feature branch onto the latest default-branch tip and to push updates with the safest force-push option allowed.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: git-feature-branch-sync
Download link: https://github.com/jcdendrite/claude-config/archive/main.zip#git-feature-branch-sync

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.