skills.rest
zmchenry
zmchenryCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

Stack Sync

Rebase and synchronize stacked Git feature branches automatically.

Updated Aug 23, 2026
Search Tags:#conflict-resolution#workflow-automation#pull-request#git-rebase#stacked-branches#branch-sync
One-click install
npx skills add https://github.com/zmchenry/dotfiles --skill stack-sync
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: Stack Sync
Source: https://github.com/zmchenry/dotfiles/tree/main/.claude/skills/stack-sync
Command: npx skills add https://github.com/zmchenry/dotfiles --skill stack-sync

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill manages and synchronizes stacked feature branches so dependent branches automatically rebalance and stay in sync, reducing manual rebases and conflicts.

Core Features & Use Cases

  • Branch stacking management: Visualize and maintain a stack of interdependent branches.
  • Automated rebases: Rebase dependents automatically when any stack member updates.
  • Safe syncing workflows: Guided steps to merge, rebase, and push with safety checks.

Quick Start

Use the stack-sync skill to align a three-branch stack starting from main: feature-auth-foundation, feature-auth-ui, feature-auth-tests. Then confirm each branch rebases and pushes with the correct upstream.

Frequently Asked Questions about Stack Sync

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
What is the best way to automate rebases for interdependent feature branches?▼

Stack Sync automates rebases for interdependent branches by applying standard Git commands like rebase and push --force-with-lease. It propagates updates from the base branch through the entire stack to maintain synchronization.

How does push --force-with-lease work when synchronizing stacked branches?▼

Push --force-with-lease safely updates remote stacked branches by checking that remote refs match your local expectations before overwriting. Stack Sync uses this during restacking to prevent losing remote updates when rebasing dependent branches.

Do I need any special dependencies to automate stacked branch rebases?▼

No special dependencies are required to automate stacked branch rebases. Stack Sync relies solely on standard Git commands and optionally uses stack metadata to guide updates, requiring no external components or plugins.

Why do my dependent Git branches lose sync when I rebase the bottom branch?▼

Dependent Git branches lose sync because standard Git rebases do not automatically propagate changes to child branches. Stack Sync solves this by restacking interdependent branches so updates cascade through the stack.

Related Skills

Explore More Software Engineering Skills→
jfmyers9jfmyers9
8

stack

Organize stacked Git-Spice branch workflows for multi-CR development.

Community
Intermediate
arbazkhan971arbazkhan971
26

finish

Finalize feature branches via merge, pull request, keep, or discard after build, lint, and tests.

Community
Advanced
awinogradovawinogradov
5

run

Automate development workflows from planning through pull request monitoring.

Community
Advanced
Knuckles-TeamKnuckles-Team
2

git-advanced

Automate Git history fixes using rebase, cherry-pick, and bisect workflows.

Official
Advanced