skills.rest
jfmyers9
jfmyers9COMMUNITY
Explore all skills by this author →
WebsiteGitHub

restack

Restack Git-Spice branches onto their bases and resolve conflicts.

8|Updated Jan 24, 2026
Search Tags:#automation#git#workflow#branches#conflicts#restack
One-click install
npx skills add https://github.com/jfmyers9/agent --skill restack-jfmyers9
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: restack
Source: https://github.com/jfmyers9/agent/tree/main/harnesses/pi/extensions/git-tool/skill-resources/git-spice/restack
Command: npx skills add https://github.com/jfmyers9/agent --skill restack-jfmyers9

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Restack Git-Spice branches onto their bases and resolve conflicts. Replaces raw git rebase for stack workflows.

Core Features & Use Cases

  • Restack branches to align with their bases during stack workflows.
  • Detect and resolve conflicts across multiple branches with a guided workflow.
  • Integrate with Git-Spice commands to streamline rebases and conflict resolution.

Quick Start

Run the restack command to restack your stack of branches onto their bases and resolve conflicts.

Frequently Asked Questions about restack

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

FAQPage Schema
How do I rebase a stack of Git branches without conflicts breaking the workflow?▼

Restacking Git-Spice branches onto their bases resolves conflicts across multiple branches using a deterministic order. It applies a guided conflict-resolution process to update staging areas and streamline stack workflows.

What is a deterministic conflict-resolution process for multi-branch git workflows?▼

A deterministic conflict-resolution process enforces a specific order for rebasing multiple branches onto their bases. It guides users through conflict markers with clear steps to ensure stack workflows update correctly.

Does this restack workflow replace raw git rebase for branch stacks?▼

Yes, restacking Git-Spice branches replaces raw git rebase for stack workflows. It manages multi-branch rebases and resolves conflicts deterministically, streamlining the alignment of branches onto their bases.

Can I resolve conflicts across multiple branches in a specific order?▼

Yes, the restack process resolves conflicts across multiple branches in a deterministic order. It enforces this sequence during the rebase to ensure staging areas update correctly and conflicts are addressed systematically.

Why does my multi-branch rebase leave unresolved conflict markers in the staging area?▼

Unresolved conflict markers occur when raw git rebase handles stack workflows without deterministic ordering. The restack process guides users through these markers with clear steps to properly update staging areas.

Related Skills

Explore More Software Engineering Skills→
nsheapsnsheaps
3

git-spice

Manage stacked Git branches and submit batch PRs via git-spice CLI.

Community
Advanced
dnvitidnviti
11

git-publish

Merge develop into main and push both branches to origin.

Community
Intermediate
luanluan
1

stack

Automates Git-Spice stacked workflows to create, navigate and submit Change Requests.

Community
Intermediate
luanluan
1

restack

Restack Git-Spice branch stacks and resolve rebase conflicts automatically.

Community
Intermediate