skills.rest
chagui
chaguiCOMMUNITY
Explore all skills by this author →
GitHub

gt-sync

Sync a Graphite stack with trunk via fetch and rebase, resolving merge conflicts with guided steps and status checks.

3|Updated Apr 11, 2019
Search Tags:#git#workflow#rebase#graphite#conflict-resolution#stack-sync
One-click install
npx skills add https://github.com/chagui/dotfiles --skill gt-sync
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: gt-sync
Source: https://github.com/chagui/dotfiles/tree/main/dot_claude/skills/gt-sync
Command: npx skills add https://github.com/chagui/dotfiles --skill gt-sync

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Sync the current Graphite stack with trunk (fetch + rebase) and resolve any merge conflicts that arise.

Core Features & Use Cases

  • Phase-based synchronization that fetches trunk, rebases the stack, and resolves merge conflicts with user-guided resolution and status checks.
  • Deterministic conflict handling with step-by-step instructions to inspect, resolve, and continue the rebase.
  • Use Case: Teams updating trunk concurrently; gt-sync helps keep the local stack aligned with trunk and minimizes manual conflict toil.

Quick Start

Invoke gt-sync to fetch trunk, perform a rebase, resolve any conflicts, and verify the stack is clean.

Frequently Asked Questions about gt-sync

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

FAQPage Schema
How do I sync a Graphite stack with trunk and resolve merge conflicts?▼

To sync a Graphite stack with trunk, you fetch trunk, perform a rebase on the stack, and resolve merge conflicts. The process provides deterministic, step-by-step conflict handling guidance to inspect, resolve, and continue the rebase.

What is the best way to handle stack maintenance when trunk is updated concurrently?▼

Stack maintenance during concurrent trunk updates involves fetching the latest trunk changes and rebasing your local stack. This keeps the stack aligned with trunk and minimizes manual conflict toil through deterministic resolution steps.

How does Graphite stack synchronization validate a clean working tree?▼

Graphite stack synchronization validates a clean working tree by running status checks after the rebase and conflict resolution phases. These checks confirm the stack is successfully synced and free of unresolved conflicts.

Can I get step-by-step instructions for resolving rebase conflicts in a Graphite stack?▼

You can resolve rebase conflicts in a Graphite stack using deterministic conflict handling. This provides step-by-step instructions to inspect the conflicting files, resolve the issues, and continue the rebase process safely.

Why should I use automated stack sync instead of manual git rebase for conflict resolution?▼

Automated stack sync fetches trunk and rebases the stack while providing deterministic conflict handling guidance and status checks, minimizing manual toil. Manual git rebase lacks these guided, phase-based validation steps for stack maintenance.

Related Skills

Explore More Software Engineering Skills→
saadjssaadjs

git-incremental-commits

Convert uncommitted changes into small conventional commits via git add -p.

Community
Advanced
luanluan
1

stack

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

Community
Intermediate
jkomorosjkomoros
9

git-workflow

Automate Git rebases, conflict resolution, and pull request creation with gh pr.

Community
Intermediate
maggitmaggit

rebase

Plan and execute non-interactive git rebase operations with safety checks.

Community
Intermediate