Skills
.Work. You
Rest

gt:restack

Community

Rebase stack branches and resolve conflicts

Software Engineering#git#merge conflicts#rebase#branch synchronization#stacked workflow#trunk mainline#resolution loop
Authorluan
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This skill solves the problem of getting a Graphite (stacked) branching workflow back in sync with updated parent branches while safely handling merge conflicts.

Core Features & Use Cases

  • Stack rebasing onto updated parents: Rebase the branch stack onto the latest main/trunk state to keep branches current.
  • Deterministic conflict resolution loop: Repeatedly read conflicted files fully, resolve all conflict markers in a single edit per file, stage fixes, and continue until the whole stack is rebuilt.
  • Operational safety guardrails: Instructs you to replace git rebase usage with this skill and provides an abort path if resolution is ambiguous.

Quick Start

Ask the agent to run gt:restack to restack your Graphite branch stack onto the latest main/trunk and resolve any merge conflicts.

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: gt:restack
Download link: https://github.com/luan/agents/archive/main.zip#gt-restack

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.