using-git-spice

Manage GitSpice stacked branches with sync, restack, and navigation commands.

3|Updated Jan 14, 2014
One-click install
npx skills add https://github.com/prateek/dotfiles --skill using-git-spice-prateek
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: using-git-spice
Source: https://github.com/prateek/dotfiles/tree/main/.agents/skills/using-git-spice
Command: npx skills add https://github.com/prateek/dotfiles --skill using-git-spice-prateek

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

Use when working with stacked branches, managing dependent PRs/CRs, or uncertain about git-spice commands (stack vs upstack vs downstack) - provides command reference, workflow patterns, and common pitfalls for the git-spice CLI tool.

Core Features & Use Cases

  • Understand and manage trunk/stack relationships with git-spice commands to keep branches aligned
  • Navigate, restack, and sync stacks without manual rebases, reducing merge conflicts and drift
  • Learn common workflows and pitfall scenarios for multi-branch development and CR submission

Quick Start

Load the git-spice skill and begin using stacked-branch workflows to manage trunk, restack, and navigation.

Frequently Asked Questions about using-git-spice

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

FAQPage Schema
How do I manage stacked Git branches without manual rebases?

Managing stacked Git branches without manual rebases involves using git-spice commands to automatically restack, sync, and navigate upstack or downstack branches, keeping dependent PRs aligned with the trunk and reducing merge conflicts.

What is the difference between upstack and downstack in git-spice?

In git-spice, upstack and downstack refer to navigating dependent branches within a stack. Upstack moves toward child branches built on the current one, while downstack moves toward parent branches closer to the trunk.

How do I sync stacked branches after trunk changes?

To sync stacked branches after trunk changes, use git-spice repo sync and restack commands to automatically re-align dependent branches, resolving drift and ensuring multi-branch feature work stays consistent across teams.

Can I use git-spice workflows for multi-branch feature development?

Yes, git-spice workflows support multi-branch feature development by providing command references and workflow patterns to navigate, restack, and sync stacked branches, handling dependent PRs and CR submission scenarios effectively.

What are common pitfalls when working with dependent PRs in stacked branches?

Common pitfalls when working with dependent PRs in stacked branches include branch drift and merge conflicts from unaligned trunk changes. Git-spice helps avoid these by automating restack and sync operations across the stack.