How do I install the Gh Stack:restack skill?

Run npx skillmds@latest add luan/gh-stack-restack in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.

Is Gh Stack:restack safe to use?

This skill has not completed SkillMD's automated safety review yet. Capability flags: makes network calls. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.

Which AI agents work with Gh Stack:restack?

This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.

Is Gh Stack:restack free to use?

Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.

Who published Gh Stack:restack?

luan (@luan) published this skill. Their other Agent Skills are listed on their SkillMD profile.

Gh Stack:restack by luan — Agent Skill

Name: Gh Stack:restack
Rating: 4.5 (4 reviews)
Author: luan

Gh Stack:restack

Rebase branches, sync with main/trunk, and resolve merge conflicts using gh-stack. REPLACES git rebase — never use it directly. Triggers: 'restack', 'rebase', 'rebase on main', 'sync with main', 'update stack', 'resolve conflicts', 'branches out of date'.

luan Updated Sep 10, 2026

File contents

Restack

Rebase gh-stack branches onto updated parents and resolve merge conflicts.

Modes

Mode	Command	When
Full sync	`gh stack sync`	Default — fetch, rebase, push, sync PR state
Rebase only	`gh stack rebase`	User says "rebase" / "restack" without push
Upstack only	`gh stack rebase --upstack`	After mid-stack changes

Steps

Sync: gh stack sync 2>&1
If clean: report which branches were rebased. Done.
If conflicts (exit code 3): run gh stack rebase then loop until resolved — a. Read each conflicted file in full before editing b. Identify all conflict markers (<<<<<<<, =======, >>>>>>>) c. Resolve every conflict region in a single edit d. git add <file> each resolved file e. gh stack rebase --continue 2>&1 f. If new conflicts appear, repeat from (a)
Push after rebase: gh stack push 2>&1
Report: list branches rebased, conflicts resolved, any issues.

Conflict Resolution Rules

Read the full file first. Count all <<<<<<< markers. Resolve all of them in one pass.
Take the semantically correct merge: understand what both sides changed, combine intent.
After editing, verify no conflict markers remain: rg -c '<<<<<<<' <file> before git add.
If a conflict is ambiguous, gh stack rebase --abort and report to the user.

Frequently asked questions